for push
Merge branch 'master' of https://github.com/jessehwong/Attendance

Conflicts:
	WebContent/desktop/init/App.js
	WebContent/desktop/modules/MyAttendance.js
Merge branch 'master' of https://github.com/jessehwong/Attendance