Yeoman page generation needs to add "Ctrl" to the controller classname variable (in test spec as well).
Merge remote-tracking branch 'origin/master'