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

Conflicts:
	logs/debug.log
	logs/error.log
	logs/info.log
userinfo
test
Merge branch 'master' of https://github.com/izou7/izou7.git
regist
test
commit
commit
Merge branch 'master' of https://github.com/izou7/izou7.git

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