Merge branch 'C1_mnzaki_javascript_fixup' into C1_AminaZoheir_#73_ViewNotifications

Conflicts:
	Idearator/app/assets/stylesheets/ideas.css.scss
Fix shebang for the pre-commit hooks.
Merge branch 'master' into C1_mnzaki_commit_hooks
Merge branch 'master' into C1_AminaZoheir_#73_ViewNotifications

Conflicts:
	Idearator/app/assets/stylesheets/ideas.css.scss
Merge pull request #239 from DevYah/C1_mnzaki_commit_hooks

Fix pre-commits for ubuntu users...
Merge branch 'C3_marwa-mehanna_#218_competition_crud' into C2_abuali_#240_competitions
Issue #73 Add new notifications migrations and models
Issue #73 Add new notification views
Issue #73 Add event handlers and redirecting methods in notifications controller
Merge branch 'master' into C1_AminaZoheir_#73_ViewNotifications
Merge pull request #241 from DevYah/b430025b0854c67ab72242a8edbe04e746851859

New Notification Migrations
Issue #240 , added competition view
make each vote record unique
modify competition-idea relation

This is now a HMT relation. The migration that used to create
the table competitions_ideas has been deleted for simplicity
since it not needed anymore, but this has been done in the previous commit by mistake.
Merge pull request #243 from DevYah/db_relations

Db relations
added monthly winner migration
added rejected column
Merge pull request #246 from DevYah/C2_omar-kassem_#227_add_to_competition_migration

added rejected column
added trending migration
Add Similarity model and migration