Issue #197, enhance the user-edit view
Merge branch 'master' into C4_Gezeery_#197_edit_user_profile
Issue #197, edit in-place edit view
Issue #197, edit code style
Issue #197, edit datepicker default and remove unnecessary css
Issue #52, edit the effect at ajax callback
Issue #52, remove unnecessary css
Issue #52, add method in user model
Issue #52, edit user profile view
Issue #52, add documentation
Issue #52, edit UML
Issue #197, add UML
Issue #52, add tests
Issue #197, add tests
Issue #52, edit UML
Issue #52, add UML
Issue #52, update UML
Issue #197, edit UML
Merge branch 'master' into C4_Gezeery_#52_view_user_profile2

Conflicts:
	Idearator/app/models/user.rb
	Idearator/app/views/users/show.html.erb
	Idearator/spec/controllers/users_controller_spec.rb
Issue #52, edit css