Merge origin/master

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