improved photo model
Merge branch 'master' of github.com:thorn/multiposter

Conflicts:
	app/models/photo.rb