fixed a user autho bugat index
merged with current master and no conflicts found
Merge pull request #15 from golden-bears-2014/Controller_Refactor

Controller refactor