Removing cdn jquery heroku hack from prev. commit. Properly fixed on herokus end
Merge branch 'dev'