conflict
update logon pages, update admin pages adding detail information for
module.
Merge branch 'master' of https://github.com/justinliucs/haflow.git

Conflicts:
	src/main/java/haflow/module/util/ModuleUtil.java