Upgrade to Rails 3.2.14, paperclip updates
Merge branch 'master' of https://github.com/christianl/responsive_fw

Conflicts:
	app/models/document.rb