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
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
Issue #234 Add Secret column to users migration
Merge pull request #253 from DevYah/9ee15e739d41b6a132fde3c07a4b769c6abfc99f

Add Similarity Model and Migrations
Merge pull request #251 from DevYah/C3_MahmoudHashish_#234_add_secret_token_migration

Issue #234 Add Secret column to users migration
Fixed the migration
reset changes to gemfile.lock and added rounds column.
Added Monthly Winner model
Merge pull request #245 from DevYah/C2_omar-kassem_#228_idea_of_the_mounth_migration

added monthly winner migration
Merge pull request #247 from DevYah/trending_migration

added trending migration