refactoring
Merge branch 'feature/number_photo_at_photoalbum-47' into staging

Conflicts:
	db/schema.rb