правки
Merge remote-tracking branch 'origin/Rails4' into Rails4

Conflicts:
	app/views/pages/index.html.slim