Merge remote-tracking branch 'origin/version_1_4_5' into version_1_4_5

Conflicts:
	src/main/java/com/aplana/timesheet/controller/ViewReportsController.java
	src/main/java/com/aplana/timesheet/dao/CalendarDAO.java
	src/main/webapp/WEB-INF/messages/messages.properties
	src/main/webapp/WEB-INF/views/includes/header.jsp