1st commit
Merge remote-tracking branch 'origin/test_paperclip' into test_paperclip

Conflicts:
	app/views/admin/photos/_form.html.erb