changed admin to controllerAs
Merge branch 'master' of github.com:jgnatch/angular-on-cuba