user dao checked
Merge branch 'tubes4progin' of https://github.com/amelia2801/IF3038-2013

Conflicts:
	ServerService/src/java/vm/dao/UserDAO.java