fix majority of the tests
Merge branch 'development' of https://github.com/werme/DAT076 into development

Conflicts:
	app/controllers/Notes.java
	app/models/Note.java
Merge branch 'development' of https://github.com/werme/DAT076 into development

Conflicts:
	app/models/Comment.java