Merge branch 'master' of https://github.com/Yakovko/Razom

Conflicts:
	server/views/index.hbs
	web/index-new.html
	web/index.html
Merge branch 'master' of https://github.com/Yakovko/Razom

Conflicts:
	server/views/index.hbs
	web/index-new.html
	web/index.html