Revert "Revert "Merge branch 'C3_Marwa_39_SubmitEditIdea' into C1_AminaZoheir_#73_ViewNotifications""

This reverts commit 051299bcd3f6e636462312392fc7db3496efc9dd.

Conflicts:
	Idearator/app/controllers/ideas_controller.rb
	Idearator/app/controllers/registrations_controller.rb
	Idearator/app/models/idea.rb
	Idearator/app/views/home/index.html.erb
	Idearator/app/views/ideas/_form.html.erb
	Idearator/app/views/ideas/show.html.erb
	Idearator/app/views/layouts/_navigation.html.erb
	Idearator/app/views/layouts/application.html.erb
	Idearator/config/routes.rb
	Idearator/db/migrate/20130407092047_create_vote_counts.rb