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

Conflicts:
	src/main/java/com/aplana/timesheet/dao/entity/Employee.java