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

This reverts commit 051299bcd3f6e636462312392fc7db3496efc9dd.

Conflicts:
	Idearator/app/views/layouts/_navigation.html.erb
Merge branch 'master' into C1_AminaZoheir_#73_ViewNotifications

Conflicts:
	Idearator/app/views/home/index.html.erb
	Idearator/config/routes.rb
Issue #73 fix application.js
Merge pull request #174 from DevYah/C1_AminaZoheir_#73_ViewNotifications

Re-add files delete when reverting merge