Issue#39 fixed rest of conflicts
Merge branch 'master' into C3_Marwa_39_SubmitEditIdea

Conflicts:
	Idearator/Gemfile.lock
	Idearator/app/controllers/ideas_controller.rb
	Idearator/app/views/ideas/_form.html.erb
	Idearator/app/views/ideas/show.html.erb
	Idearator/config/routes.rb
Issue #73 add view_notifications action and view
Issue #73 Add .to_s() in text method in all notification classes
Merge branch 'C1_AminaZoheir_#73_Notifications_migrations' into C1_AminaZoheir_#73_ViewNotifications
Merge branch 'C1_AminaZoheir_#73_Notification_Module' into C1_AminaZoheir_#73_ViewNotifications
Merge branch 'C1_AminaZoheir_#73_Notification_Module' into C1_AminaZoheir_#73_ViewNotifications

Conflicts:
	Idearator/app/models/approve_committee_notification.rb
	Idearator/app/models/archive_notification.rb
	Idearator/app/models/comment_notification.rb
	Idearator/app/models/delete_notification.rb
	Idearator/app/models/disapprove_idea_notification.rb
	Idearator/app/models/edit_notification.rb
	Idearator/app/models/vote_notification.rb
Issue #73 Remove notification link
Merge branch 'master' into C3_Marwa_39_SubmitEditIdea
Issue #39, Add ideas controller
Issue #39, Add idea model
Issue #39, Add ideas_tags model
Merge branch 'master' into C1_AminaZoheir_#73_ViewNotifications
Issue #39, Add form in views/ideas
Issue #39, Add edit view
Issue #39, Add new view
Issue #39, Add show view
Issue #39, Add development file

this file is changed to make paperclip work.
Issue #39, Add routes
Issue #73 remove link from disapprove_idea_notification