Made all controllers singleton. Return correct from factory
Merge branch 'master' of github.com:faern/book-a-hobbit