Merge branch 'master' into feature/topics

Signed-off-by: A. Prooks <aprooks@live.ru>

Conflicts:
	app/assets/app.js
	app/scripts/app.js