update from latest ember app kit
commit d105fa0c9aa4f9c306b2d10f6a888b355d3e9aad.

Conflicts:
	.bowerrc
	.gitignore
	.jshintrc
	.travis.yml
	Gruntfile.js
	README.md
	api-stub/README.md
	api-stub/routes.js
	app/adapters/application.js
	app/app.js
	app/controllers/.gitkeep
	app/helpers/.gitkeep
	app/index.html
	app/models/.gitkeep
	app/router.js
	app/routes/.gitkeep
	app/styles/.gitkeep
	app/styles/app.css
	app/templates/.gitkeep
	app/templates/application.hbs
	app/templates/error.hbs
	app/utils/.gitkeep
	app/views/.gitkeep
	bower.json
	config/environment.js
	config/environments/development.js
	config/environments/production.js
	config/environments/test.js
	package.json
	public/assets/.gitkeep
	public/crossdomain.xml
	public/humans.txt
	public/robots.txt
	public/testem.js
	tasks/.jshintrc
	tasks/custom-options/.gitkeep
	tasks/express-server.js
	tasks/helpers.js
	tasks/locking.js
	tasks/options/autoprefixer.js
	tasks/options/clean.js
	tasks/options/coffee.js
	tasks/options/compass.js
	tasks/options/concat_sourcemap.js
	tasks/options/concurrent.js
	tasks/options/copy.js
	tasks/options/emberTemplates.js
	tasks/options/emberscript.js
	tasks/options/emblem.js
	tasks/options/express-server.js
	tasks/options/fancySprites.js
	tasks/options/htmlmin.js
	tasks/options/imagemin.js
	tasks/options/jshint.js
	tasks/options/less.js
	tasks/options/preprocess.js
	tasks/options/rev.js
	tasks/options/sass.js
	tasks/options/stylus.js
	tasks/options/testem.js
	tasks/options/transpile.js
	tasks/options/usemin.js
	tasks/options/useminPrepare.js
	tasks/options/watch.js
	testem.json
	tests/.jshintrc
	vendor/loader.js