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 branch 'C3_MahmoudHashish_#44_Delete_Idea'
Update pre-commit gem. Add white_space and tabs check. Remove erb from rubocop.
Fix pre-commit gem version.

Changed the wrong commit hash in the last commit.
Add .gitattributes file and autocrlf option.

Fix EOL problems.
Merge pull request #118 from DevYah/C1_mnzaki_commit_hooks

Fix some problems with pre-commit checks
Merge branch 'master' of https://github.com/DevYah/coolsoft-13
Run through rvm if rvm is present

For Mac users with default RailsInstaller setup.
Merge branch 'master' into C1_mnzaki_commit_hooks
Update pre-commit Gem.

One more evil update.
Merge pull request #119 from DevYah/C1_mnzaki_commit_hooks

Fix pre-commit checks for Mac OS users.
Merge branch 'master' of https://github.com/DevYah/coolsoft-13
Fixed the relations in master, #120

Some relationships overwritted others, so they had to be redefined.