Fixed the relations in master, #120

Some relationships overwritted others, so they had to be redefined.
#120, edited code style
Merge pull request #122 from DevYah/DB_#120_repair_master_relations

Fix conflicting relation names in Idea, User, and Comment.
Pre-commit checks: remove migrations check.
Issue #73 Change relation between Idea/UserNotification and User from many to many to has many through
Pre-commit: fix bug with calling `which`

Apparently output redirection messes with the exit status.
Merge pull request #124 from DevYah/C1_mnzaki_commit_hooks

Fix checks.
Merge branch 'master' into C1_AminaZoheir_#73_Notifications_migrations

Conflicts:
	Idearator/app/models/user.rb
Merge branch 'master' into C1_AminaZoheir_#73_Notifications_migrations
Merge pull request #123 from DevYah/C1_AminaZoheir_#73_Notifications_migrations

Issue #73 Change relation
Issue #80, add vote_count table to track daily changes in votes.

This table is needed to create the Threshold method. "prev_day_votes" variable will store the
number of votes the idea got the day before, and "curr_day_votes" will store the votes that
the idea will get in the new day. Each time the Threshold method is called, the "curr_day_votes"
column values will be set to 0, and the previous values will overwrite the column "prev_day_votes".
#80, Fix attr_accessible in VoteCount model
Merge pull request #125 from DevYah/C4_Gezeery_#80_dashboard_view_ideas_performance_migrations

Issue #80, add vote_count table to track daily changes in votes. Needed for threshold calculations.
Fix join_table for user likes comment relation.

Addresses #120
Merge pull request #126 from DevYah/C1_mnzaki_user_model_likes_relation

Fix join_table for user likes comment relation.
Added modified models
Updated Devise settings
Updated SMTP settings to send email to Admin
Updated Welcome email
Updated Sign up page