Merge branch 'master' of https://github.com/ahlunju/ember-app (reverted from commit e02c2039bdd02478d56a05f9588a1ea73020f476)