add class for massage(coming soon)
Merge remote-tracking branch 'origin/version_2' into version_2

Conflicts:
	js/app.js
	templates/main.html