fixed about
Merge remote-tracking branch 'upstream/development' into development
merging changes from nilo
UsersController
Deletions
User view etc
merge fixed
Merge pull request #32 from henrievk/development

User view - show