updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/shiftclocker/Clock.class
	build/classes/shiftclocker/EmployeeManager.class
	build/classes/shiftclocker/LogManager.class