Ember dependency on 1.7.x
Merge branch 'master' of github.com:HackathonHackers/map

Conflicts:
	bower.json