APLANATS-482
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/views/timesheet.jsp
	src/main/webapp/resources/js/timesheet.js