Merge pull request #17 from jmas/master

Merge from master to dev_user
Updating User issue #1
Updating dump to dev_user
Updating User views issue #1
Updating User views issue #1
Update User Controller issue #1
User controller conflict fixed.