Issue #197, add UML
Issue #197, add tests
Issue #197, edit UML
Merge branch 'C4_Gezeery_#52_view_user_profile2' into C4_Gezeery_#197_edit_user_profile

Conflicts:
	Idearator/spec/controllers/users_controller_spec.rb