Merge origin/databasetest into Federico

Conflicts:
	src/main/java/se/kth/ict/ffm/recruitsystem/view/HeaderManager.java