commit
Merge branch 'master' of
https://github.com/krumer/BirthdayReminder-Server.git

Conflicts:
	BirthdayReminder/src/model/accountmanagement/AccountService.java
	BirthdayReminder/test/api/AccountsTest.java