Merge branch 'master' of https://github.com/izou7/izou7.git

Conflicts:
	.settings/org.eclipse.wst.common.project.facet.core.xml
	src/main/java/cn/chinattclub/izou7/entity/Activity.java
	src/main/java/cn/chinattclub/izou7/service/ActivityService.java
	src/main/java/cn/chinattclub/izou7/service/impl/ActivityServiceImpl.java
	src/main/java/cn/chinattclub/izou7/web/ActivityController.java
	src/main/resources/database.properties
	src/main/webapp/static/js/activity/myActivitys.js
	target/classes/database.properties