Problem Edit is able to get data but not save back
Merge branch 'master' of https://github.com/kanet4u/occm

Conflicts:
	src/com/occm/daos/impl/UserDaoImpl.java