Merge branch 'master' of github.com:jkenneydaniel/NukeYa
Fixed core controller name-spacing for session loading. Cleaned up login controller.
Fix bad upgrade script - big nono