Fixed photo collisions.
Merge branch 'property_use_cases'

Conflicts:
	Gemfile