Add ruby 2.0.0 for heroku
Merge branch 'heroku'
Add pg and thin to production env
Merge branch 'heroku'
Add gemfile.lock
Merge branch 'heroku'
Add group#show
Add group#show, description and img_url to group model
Merge branch 'group'

Conflicts:
	Gemfile.lock