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

Conflicts:
	src/main/java/cn/chinattclub/izou7/entity/Article.java
	src/main/java/cn/chinattclub/izou7/entity/Public.java
	src/main/java/cn/chinattclub/izou7/web/ActivityController.java
Merge branch 'master' of https://github.com/izou7/izou7.git
...