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

Conflicts:
	src/main/webapp/WEB-INF/freemarker/activity/activity.ftl