ember-auth-rails-demo.spec
Merge branch 'master', remote branch 'origin'