added nag controllers
places view initialized
Merge remote-tracking branch 'origin/master'