update table
Merge origin/master
login update
Merge origin/master

Conflicts:
	src/java/DAO/UserDAO.java