Merge branch 'hotfix/heroku_assets'
rewrite helper and change twitter bootstrap group in gemfile
Merge branch 'hotfix/heroku_gems' into develop