upgrade ember.js version and jshint version
Merge branch 'issue836' into 1.7.x