Merge origin/Federico into Federico

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

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

Conflicts:
	src/main/webapp/index.xhtml
	src/main/webapp/template/template.xhtml
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
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

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 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

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
Entities Person and Competenceprofile are now one-to-one related
SQL script updated with correct locale codes for sweden
Merge origin/databasetest into databasetest

Conflicts:
	database/RecruitSystemDBCreationAndInsert.sql
	src/main/java/se/kth/ict/ffm/recruitsystem/controller/ApplicationFacade.java
	src/main/java/se/kth/ict/ffm/recruitsystem/controller/LanguageBean.java
	src/main/java/se/kth/ict/ffm/recruitsystem/util/dto/ApplicationDTO.java
	src/main/java/se/kth/ict/ffm/recruitsystem/view/RegisterApplicationManager.java
	src/main/webapp/register.xhtml
glassfish-web.xml created and character encoding set to UTF-8
Merge origin/databasetest into databasetest

Conflicts:
	database/RecruitSystemDBCreationAndInsert.sql
	src/main/java/se/kth/ict/ffm/recruitsystem/controller/ApplicationFacade.java
	src/main/java/se/kth/ict/ffm/recruitsystem/controller/LanguageBean.java
	src/main/java/se/kth/ict/ffm/recruitsystem/util/dto/ApplicationDTO.java
	src/main/java/se/kth/ict/ffm/recruitsystem/view/RegisterApplicationManager.java
	src/main/webapp/register.xhtml
Merge databasetest

Conflicts:
	database/RecruitSystemDBCreationAndInsert.sql
	src/main/java/se/kth/ict/ffm/recruitsystem/controller/ApplicationFacade.java
	src/main/java/se/kth/ict/ffm/recruitsystem/view/LanguageBean.java
	src/main/java/se/kth/ict/ffm/recruitsystem/view/RegisterApplicationManager.java
Merge databasetest

Conflicts:
	database/RecruitSystemDBCreationAndInsert.sql
	src/main/java/se/kth/ict/ffm/recruitsystem/controller/ApplicationFacade.java
	src/main/java/se/kth/ict/ffm/recruitsystem/view/LanguageBean.java
	src/main/java/se/kth/ict/ffm/recruitsystem/view/RegisterApplicationManager.java