updated with merge'free' conflicts
updated the bands and user controller
Merge pull request #6 from pdarden/kb_branch

Updated the controller for users and bands