修正若干controller类中的注释，并添加读取hqshop.properties的配置文件的xml部分。
添加了admin和role模块。
添加了memberattribute和memberrank两个模块。
添加了user模块的deposit子模块和area子模块。
test
cmmit
范德萨
Merge branch 'master' of https://github.com/hongqiang/shop_format

Conflicts:
	src/main/java/com/hongqiang/shop/common/utils/FreeMarkers.java
	src/main/java/com/hongqiang/shop/common/web/BaseController.java
	src/main/java/com/hongqiang/shop/modules/product/web/admin/ProductNotifyController.java
	src/main/java/com/hongqiang/shop/modules/product/web/member/ProductNotifyController.java
	src/main/java/com/hongqiang/shop/modules/product/web/shop/ProductNotifyController.java
	src/main/resources/applicationContext.xml
	target/m2e-wtp/web-resources/META-INF/maven/com.hongqiang.shop/shop/pom.properties