rails def app
add rails
bundle install
del files idea
release candidate heroku test
fix
Merge branch 'develop'

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'develop'

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'develop'

Conflicts:
	Gemfile
	Gemfile.lock
fix 3
fix 3
fix 3
fix 4
fix 5
fix 5
fix 6
fix 7
fix 7
fix 8
fix 9