user action with hbase
Merge branch 'master' of https://github.com/yang2012/DocumentManageSystem

Conflicts:
	src/main/java/dmsystem/dao/UserDao.java