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