add therubyracer to Gemfile
merge master o___o
Merge branch 'develop'