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 IdeaNotification, UserNotification models and update assosiations with User and Idea models
Issue #73 renamed UserNotificaiton model
Issue #73 Add Notification models inheriting from IdeaNotification and UserNotification
Issue #73 Add send and text methods to VoteNotification model
Issue #73 Add send and text methods to CommentNotification model
Issue #73 Add send and text methods to DeleteNotification model
Issue #73 Add send and text methods to EditNotification model
Issue #73 Add send and text methods to ArchiveNotification model
Issue #73 Add send and text methods to DisapproveTdeaNotification model
Issue #73 Fix error in some notification models

in DeleteNotification, EditNotification, ArchiveNotification, DisapproveIdeaNotification line 4 changed from CommentNotification.new to (Action)Notification.new
Issue #73 Add send and text methods to InviteCommitteeNotification model
Issue #73 Add send and text methods to ApproveCommitteeNotification model
Issue #73 Rename IdeaNotification model
Issue #73 Change parameters of send method in IdeaNotifications
Merge branch 'C1_AminaZoheir_#73_Notifications_migrations' into C1_AminaZoheir_#73_Notification_Module
Issue #73 Fix some errors in notification models

1. Add missing .save at the enf os send_notification method
2. Correct class names
Merge branch 'master' into C1_AminaZoheir_#73_Notification_Module

Conflicts:
	Idearator/app/models/idea_notification.rb
	Idearator/app/models/user_notification.rb
Removed redundant table CommitteeIdeas from database

This table was based on the many-to-many relationship between the tables
Committee and Ideas, which is not the case. Therefore this table has been
dropped and a foriegn key already exists in the table Idea that references
the Committee member that approved this idea.