User Management and User Authentication

Fixed an issue with user login and some bug fixes with user management.
Merge remote-tracking branch 'origin/GUI-copy_7-11-14' into GUI_Branch_5-30-14