changes to appcontroller
Merge branch 'user-login' of https://github.com/snukes/magc into user-login