Fjernet stuff
Merge branch 'master' of https://github.com/tobiastry/Photoapp

Conflicts:
	Client/src/test/java/login/LoginLogicTest.java

Pulla master
Endret JAvadoc