Merge branch 'C1_mnzaki_javascript_fixup' into C1_AminaZoheir_#73_ViewNotifications

Conflicts:
	Idearator/app/assets/stylesheets/ideas.css.scss
Merge branch 'master' into C1_AminaZoheir_#73_ViewNotifications

Conflicts:
	Idearator/app/assets/stylesheets/ideas.css.scss
Issue #73 Add new notifications migrations and models
Merge pull request #241 from DevYah/b430025b0854c67ab72242a8edbe04e746851859

New Notification Migrations