#15 Archetype audit
Merge branch 'master' of https://github.com/daowangli/hibernarm-management

Conflicts:
	src/main/java/org/hibernarm/management/archetype/action/FileUploadAction.java
	src/main/java/org/hibernarm/management/util/Log4jInit.java
	src/main/resources/hibernate.cfg.xml
	src/main/resources/struts_home.xml