Add Gitter badge
Merge branch 'issue843' into 1.7.x
Merge remote-tracking branch 'origin/1.7.x' into 1.7.x
upgrade ember.js version and jshint version
fix merge conflicts