"Start desktop app"
Merge branch 'master' of https://github.com/jessehwong/Attendance

Conflicts:
	src/main/java/com/jinfonet/attendance/action/LoginAction.java
	src/main/java/struts.xml
daily commit