APLANATS-533
APLANATS-534
Merge remote-tracking branch 'origin/version_1_4_5' into version_1_4_5

Conflicts:
	src/main/java/com/aplana/timesheet/service/SendMailService.java