Added faker gem and populate.rake
resolved conflict
#114, added password
Fix Settings Migrations
#114, added 3 tags per idea
Merge pull request #114 from DevYah/C4_Hesham_Faker

Added faker gem and populate.rake
Add default value to settings
Merge pull request #115 from DevYah/C1_Sameh_#79_account_settings_migrations

Fix User Settings Migrations
Merge pull request #118 from DevYah/C1_mnzaki_commit_hooks

Fix some problems with pre-commit checks
Merge pull request #119 from DevYah/C1_mnzaki_commit_hooks

Fix pre-commit checks for Mac OS users.
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.
Issue #73 Change relation between Idea/UserNotification and User from many to many to has many through
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
Merge branch 'master' into C3_dayna161193_#81_ShareIdeasOnPinterest

Conflicts:
	Idearator/app/models/idea.rb
Modified the view