Merge pull request #31 from Reservit/omar

Omar
added settings view and refactored code in users controller, user model, and requestadmin view
Merge pull request #32 from Reservit/benjamin

added settings view and refactored code in users controller, user model,...
Merge branch 'master' into omar
Still working on getting only the tabbed views working, but the major features are working correctly. Bug fixes will come starting tomorrow.