heroku
del cap
add gem for heroku
Merge branch 'release/v1.02'

Conflicts:
	Gemfile