Update to rails 3.2.11
Merge branch 'master' into new_design

Conflicts:
	Gemfile.lock
Keep aspect ratio, do not crop
Keep real aspect ratios, update CSS
Merge branch 'master' into new_design

Conflicts:
	app/assets/stylesheets/main.scss