Merge branch 'master' of https://github.com/KernelCorp/masterpiece

Conflicts:
	app/views/refinery/pages/_nav_container.html.erb
	app/views/refinery/pages/home.html.erb
	config/locales/ru.yml
Merge branch 'master' of https://github.com/KernelCorp/masterpiece