2014-12-29
Merge branch 'master' of https://github.com/gaodachuan/topit-frame

Conflicts:
	HouseManagerSystem/src/main/java/com/housemanagersystem/base/impl/BaseController.java
	HouseManagerSystem/target/classes/com/housemanagersystem/base/impl/BaseController.class
	topit-web/src/main/resources/config/hibernate/hibernate.cfg.xml
	topit-web/src/main/webapp/WEB-INF/view/centerBusiness/business.jsp
	topit-web/target/classes/config/hibernate/hibernate.cfg.xml
	topit-web/target/m2e-wtp/web-resources/META-INF/maven/com.belletopsports/topit-web/pom.properties
new s