Merge branch 'master' of github.com:DevYah/coolsoft-13 into C1_mennaamr_#91_Facebook_login

Conflicts:
	Idearator/Gemfile
	Idearator/Gemfile.lock
	Idearator/app/controllers/home_controller.rb
	Idearator/app/controllers/registrations_controller.rb
	Idearator/app/controllers/users_controller.rb
	Idearator/app/views/home/index.html.erb
	Idearator/app/views/layouts/application.html.erb
	Idearator/config/environment.rb
	Idearator/config/routes.rb
	Idearator/db/schema.rb
	Idearator/test/functional/home_controller_test.rb
Merge Master into C1_mennaamr_#91_Facebook_login
Merge branch 'master' of github.com:DevYah/coolsoft-13 into C1_mennaamr_#91_Facebook_login
Added SMTP configuration to Development.rb
Updated SMTP configuration settings
Added modified models
Updated Devise settings
Updated SMTP settings to send email to Admin
Updated Welcome email
Updated Sign up page
Updated User model/controller and registration controller to enhance sign up
Added some JS magic to the Sign Up page
Added custom email to send to Admin when a new committee member signs up
Changed mail sender because Gmail suspended the other account
Added User Registration tests
Added Capybara & Factory_girl gems for testing integration with Devise
Added test files for Facebook sign up with omniauth
Updated notice message if user wants to sign out
Updated sign out message
Added UML