MORE CHANGES
Merge branch 'master' into daria

Conflicts:
	app/views/home/index.html.erb
Merge branch 'daria'