http://jira.aplana.com/browse/APLANATS-1042
APLANATS-1042
APLANATS-1042
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/aplana/timesheet/form/validator/TimeSheetFormValidator.java
	src/main/webapp/resources/js/timesheet.js