Merge databasetest

Conflicts:
	src/main/java/se/kth/ict/ffm/recruitsystem/view/RegisterApplicationManager.java
	src/main/webapp/register.xhtml