Have ember autogenerate an object controller
Merge remote branch 'origin/dev'