Refresh the User's table and model to remove conflicts with devise
Initial setup of devise - succesful sign up, sign in and log out
Ticket0113: Revise controllers to use Devise functions
Ticket0113: Fix Merge conflict and Revise controller to use Devise functions
Ticket0111: Revise model to become Devise-friendly
Update local master for Ticket0111 merger
Ticket0111: Update User model for Devise compatibility