add paperclip
add content control to AA
Merge branch 'master' into paperclip

Conflicts:
	app/admin/content.rb
	app/admin/photo.rb
	db/development.sqlite3
finish paperclip