Paperclip gem installed
Merge branch 'master' into TeaPane

Conflicts:
	app/views/items/_form.html.erb