messages
Merge branch 'master' of https://github.com/jhasselgren/Secretary

Conflicts:
	src/main/java/secretary/config/WebConfig.java
	src/main/java/secretary/web/controller/ProjectController.java
	src/main/webapp/WEB-INF/views/project/show.html