Merge remote-tracking branch 'origin/jedp-apg'
weeeeee
useredit fix for add user function. Split functions into two forms.
Code format fixes; Enable Delete User function.
Remove UserDelete, use UserAttr instead.
drop-down
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
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
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