Merge branch 'master' of https://github.com/melnikov5/ember-apps

Conflicts:
	starter/js/router.js
Merge branch 'master' of https://github.com/melnikov5/ember-apps

Conflicts:
	starter/js/router.js