Merge branch 'dev' into 'master'

javadoc/NTNU/IDATT1002/controllers/UploadedSingle.html

javadoc/NTNU/IDATT1002/controllers/ViewAlbum.html

javadoc/NTNU/IDATT1002/controllers/ViewPicture.html

javadoc/NTNU/IDATT1002/controllers/package-summary.html

javadoc/NTNU/IDATT1002/controllers/package-tree.html

javadoc/NTNU/IDATT1002/database/EntityManagerConfig.html

javadoc/NTNU/IDATT1002/database/LoadDatabase.html

javadoc/NTNU/IDATT1002/database/package-summary.html

javadoc/NTNU/IDATT1002/database/package-tree.html

javadoc/NTNU/IDATT1002/filters/AlbumFilter.html

javadoc/NTNU/IDATT1002/filters/ImageFilter.html

javadoc/NTNU/IDATT1002/filters/package-summary.html

javadoc/NTNU/IDATT1002/filters/package-tree.html

javadoc/NTNU/IDATT1002/models/Album.html

javadoc/NTNU/IDATT1002/models/GeoLocation.html

javadoc/NTNU/IDATT1002/models/Histogram.html

javadoc/NTNU/IDATT1002/models/Image.html

javadoc/NTNU/IDATT1002/models/ImageAlbum.html

javadoc/NTNU/IDATT1002/models/Login.html

javadoc/NTNU/IDATT1002/models/Metadata.html