Fixed authorization to now use the user class we define and work with our user controller
Merge branch 'refs/heads/Shiro-Authentication'