Adds profile view (for later implementation with controller and Uesr model)
Makes profiles pretty to look at
Resolves merge conflicts in User controller
Resolves conflicts in User model (model last time as well, not controller)
Merge branch 'master' of github.com:hybrida/hybridaweb2-play
Some fixes with Profile controller and User model
Resolves merge conflicts in User model. Again.