rydash/jedp-development — pull request #4 by rydash (2014-11-17 05:21:38+00:00)
Title: Merge origin/master

Conflicts:
src/java/com/ateam/hibernate/HibernateDAOImpl.java
src/java/com/ateam/login/Bean.java
web/WEB-INF/applicationContext.xml
web/useredit.xhtml