coffee rails gem removed by mistake
Merge branch 'master' into prod