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

Conflicts:
	src/main/webapp/static/js/activity/activity.js