Merge origin/master

Conflicts:
	src/main/java/no/hist/aitel/stud/sks/rest/controller/AccountsController.java