Merge branch 'feature/add_flash_study_request-46' into develop
Merge branch 'develop' of github.com:kaize/castle into develop
fix bug (add amount photo) 47
Merge branch 'feature/number_photo_at_photoalbum-47' into staging

Conflicts:
	db/schema.rb