Merge branch 'C1_mnzaki_javascript_fixup' into C1_AminaZoheir_#73_ViewNotifications

Conflicts:
	Idearator/app/assets/stylesheets/ideas.css.scss
Issue #39 , slim down the ideas controller
Issue #39, Add send_edit_notifications in idea.rb
Issue #39, Add vote_for/unvote_for/voted_for in user.rb
Issue #39,Used methods from model in show.html.erb
Issue #39,spaces in vote_notification.rb
Merge branch 'master' into C3_Marwa_39_SubmitEditIdea
Merge branch 'master' into C3_Marwa_39_SubmitEditIdea

Conflicts:
	Idearator/app/controllers/ideas_controller.rb
	Idearator/app/models/idea.rb
	Idearator/app/views/ideas/show.html.erb
Issue #39, Add ideas_controller
Issue #39, Add requirments of bootstrap after jquery
Issue #39,MODIFY the show view
Issue #39, Modify css.scss
Issue #39, Add partial share
Issue #39,Add partial vore_component
Issue #39,Add js files for vote/unvote
Issue #39, Add partial image
Merge branch 'master' into C1_AminaZoheir_#73_ViewNotifications

Conflicts:
	Idearator/app/assets/stylesheets/ideas.css.scss
Issue #73 Add new notifications migrations and models
Issue #39, fix delete
Merge branch 'master' into C3_Marwa_39_SubmitEditIdea