locale fix
affixed header
Merge branch 'features/ruby_212_rails_411' of github.com:panterch/future_kids into features/ruby_212_rails_411

Conflicts:
	app/assets/stylesheets/application.css.scss