no message
Merge branch 'feature/20131028' into develop

Conflicts:
	0.01/public/script/main.js