today's work
Merge remote-tracking branch 'origin/devel' into devel

Conflicts:
	init.js
	script/app.js
today's work