Merge branch 'release' of https://github.com/Tacahilo/drop_the_latte into release
ignore binstubs
Update ruby-version
fix bcrypt
partial photos
fix spec of flash
Merge branch 'develop' into release

Conflicts:
	Gemfile
Merge branch 'release' of https://github.com/Tacahilo/drop_the_latte into release