register
register
register
Merge origin/master

Conflicts:
	src/main/webapp/login.xhtml
	src/main/webapp/register.xhtml
database
created entity classes
Merge origin/Federico into Federico

Conflicts:
	src/main/webapp/index.xhtml
	src/main/webapp/template/template.xhtml
wokring with register application
wokring with register application
Merge origin/Federico into Federico

Conflicts:
	src/main/webapp/index.xhtml
	src/main/webapp/template/template.xhtml
wokring with register application
Merge origin/Federico into Federico

Conflicts:
	src/main/webapp/index.xhtml
	src/main/webapp/template/template.xhtml
Merge origin/databasetest into Federico

Conflicts:
	src/main/java/se/kth/ict/ffm/recruitsystem/view/HeaderManager.java
Merge origin/Federico into Federico

Conflicts:
	src/main/webapp/index.xhtml
	src/main/webapp/template/template.xhtml
Merge origin/databasetest into Federico

Conflicts:
	src/main/java/se/kth/ict/ffm/recruitsystem/view/HeaderManager.java
Merge origin/databasetest into Federico

Conflicts:
	src/main/java/se/kth/ict/ffm/recruitsystem/view/HeaderManager.java
Merge origin/databasetest into databasetest

Conflicts:
	src/main/java/se/kth/ict/ffm/recruitsystem/controller/ApplicationFacade.java
	src/main/java/se/kth/ict/ffm/recruitsystem/util/DateUtil.java
	src/main/java/se/kth/ict/ffm/recruitsystem/view/ApplicationDTO.java
	src/main/java/se/kth/ict/ffm/recruitsystem/view/RegisterApplicationManager.java
	src/main/webapp/register.xhtml
Merge origin/databasetest into databasetest
register application functionality in place
register application functionality in place