Merge branch 'dev' into 'master'

Weekly merge to Master See merge request !165

Merge branch 'dev' into 'master'
aa9515b5 · Eirik Steira · e510257e · 9782ffcf · e510257e · e510257e
Commit aa9515b5 authored 5 years ago by Eirik Steira
--- a/javadoc/NTNU/IDATT1002/models/Tag.html
+++ b/javadoc/NTNU/IDATT1002/models/Tag.html
--- a/javadoc/NTNU/IDATT1002/models/User.html
+++ b/javadoc/NTNU/IDATT1002/models/User.html
--- a/javadoc/NTNU/IDATT1002/models/package-summary.html
+++ b/javadoc/NTNU/IDATT1002/models/package-summary.html
--- a/javadoc/NTNU/IDATT1002/models/package-tree.html
+++ b/javadoc/NTNU/IDATT1002/models/package-tree.html
--- a/javadoc/NTNU/IDATT1002/package-summary.html
+++ b/javadoc/NTNU/IDATT1002/package-summary.html
--- a/javadoc/NTNU/IDATT1002/package-tree.html
+++ b/javadoc/NTNU/IDATT1002/package-tree.html
--- a/javadoc/NTNU/IDATT1002/repository/AlbumRepository.html
+++ b/javadoc/NTNU/IDATT1002/repository/AlbumRepository.html
--- a/javadoc/NTNU/IDATT1002/repository/GeoLocatioRepository.html
+++ b/javadoc/NTNU/IDATT1002/repository/GeoLocatioRepository.html
--- a/javadoc/NTNU/IDATT1002/repository/HistorgramRepository.html
+++ b/javadoc/NTNU/IDATT1002/repository/HistorgramRepository.html
--- a/javadoc/NTNU/IDATT1002/repository/ImageAlbumRepository.html
+++ b/javadoc/NTNU/IDATT1002/repository/ImageAlbumRepository.html
--- a/javadoc/NTNU/IDATT1002/repository/ImageRepository.html
+++ b/javadoc/NTNU/IDATT1002/repository/ImageRepository.html
--- a/javadoc/NTNU/IDATT1002/repository/LoginRepository.html
+++ b/javadoc/NTNU/IDATT1002/repository/LoginRepository.html
--- a/javadoc/NTNU/IDATT1002/repository/MetadataRepository.html
+++ b/javadoc/NTNU/IDATT1002/repository/MetadataRepository.html
--- a/javadoc/NTNU/IDATT1002/repository/Repository.html
+++ b/javadoc/NTNU/IDATT1002/repository/Repository.html
--- a/javadoc/NTNU/IDATT1002/repository/TagRepository.html
+++ b/javadoc/NTNU/IDATT1002/repository/TagRepository.html
--- a/javadoc/NTNU/IDATT1002/repository/UserRepository.html
+++ b/javadoc/NTNU/IDATT1002/repository/UserRepository.html
--- a/javadoc/NTNU/IDATT1002/repository/package-summary.html
+++ b/javadoc/NTNU/IDATT1002/repository/package-summary.html
--- a/javadoc/NTNU/IDATT1002/repository/package-tree.html
+++ b/javadoc/NTNU/IDATT1002/repository/package-tree.html
--- a/javadoc/NTNU/IDATT1002/service/AlbumDocument.html
+++ b/javadoc/NTNU/IDATT1002/service/AlbumDocument.html
--- a/javadoc/NTNU/IDATT1002/service/AlbumService.html
+++ b/javadoc/NTNU/IDATT1002/service/AlbumService.html