optimize codes
Merge branch 'master' of https://github.com/jessehwong/DesignatedDriving

Conflicts:
	WebContent/WEB-INF/actionContext.xml
	WebContent/WEB-INF/applicationContext.xml
	WebContent/WEB-INF/content/login.jsp
	WebContent/WEB-INF/content/register.jsp
	WebContent/WEB-INF/lib/dependencies
	WebContent/index.html
	src/main/java/com/cosoft/drive/action/Login.java
	src/main/java/com/cosoft/drive/dao/impl/BaseDaoHbnImpl.java
	src/main/java/com/cosoft/drive/service/impl/DesignatedDrivingServiceImpl.java
	src/main/java/dbconn.properties
	src/main/java/struts.xml
Merge branch 'master' of
https://github.com/jessehwong/DesignatedDriving.git

Conflicts:
	WebContent/WEB-INF/actionContext.xml
	WebContent/WEB-INF/content/register.jsp
	src/main/java/com/cosoft/drive/action/Login.java
	src/main/java/com/cosoft/drive/dao/impl/BaseDaoHbnImpl.java
	src/main/java/com/cosoft/drive/dao/impl/UserDaoHbnImpl.java
	src/main/java/com/cosoft/drive/service/impl/DesignatedDrivingServiceImpl.java
	src/main/java/dbconn.properties
	src/main/java/struts.xml