Merge origin/master

Conflicts:
	EESSBackend/nbproject/project.properties
	EESSBackend/src/conf/Values.sql
	EESSBackend/src/java/dk/cphbusiness/control/EESSManagerBean.java
	EESSContract/src/dto/DTOStudent.java
	EESSfrontend/src/java/dk/cphbusiness/commands/CommandFactory.java
Merge origin/master

Conflicts:
	EESSBackend/nbproject/project.properties
	EESSBackend/src/conf/Values.sql
	EESSBackend/src/java/dk/cphbusiness/control/EESSManagerBean.java
	EESSContract/src/dto/DTOStudent.java
	EESSfrontend/src/java/dk/cphbusiness/commands/CommandFactory.java
Merge origin/master

Conflicts:
	EESSfrontend/src/java/dk/cphbusiness/commands/ToSecondElectionPageCommand.java
Merge origin/master

Conflicts:
	EESSfrontend/src/java/dk/cphbusiness/commands/ToSecondElectionPageCommand.java