Issue #80, edit UML
Merge branch 'master' into C4_Gezeery_#80_dashboard_view_ideas_performance
Issue #80, add tests
Issue #80, edit UML
Merge branch 'master' into C4_Gezeery_#80_dashboard_view_ideas_performance

Conflicts:
	Idearator/spec/controllers/dashboard_controller_spec.rb
Merge branch 'master' into C4_Gezeery_#80_dashboard_view_ideas_performance

Conflicts:
	Idearator/app/mailers/user_mailer.rb
Merge pull request #286 from DevYah/C4_Gezeery_#80_dashboard_view_ideas_performance

C4 gezeery #80 dashboard view ideas performance
Merge branch 'master' into C4_Gezeery_#197_edit_user_profile

Conflicts:
	Idearator/app/mailers/user_mailer.rb
	Idearator/spec/controllers/users_controller_spec.rb