Added modified Gemfile, Schema and Migration files after installing Devise
Merge branch 'master' into C1_mennaamr_#40_Registration
Issue #42 makes user attributes accessible
Issue #42 Adds action confirm_deactivate
Issue #42 Adds action deactivate
Issue #42 Adds action activate
Issue #42 Resolves conflict when merging lina's branch
Merge branch 'master' into C1_mennaamr_#40_Registration

Conflicts:
	Idearator/db/schema.rb
Issue #42 Adds authentication
issue #37, added committee choose area of expertise
Adds documentation
Add tlsmail gem
Add user controller and model
Add sign up and sing in/out links to the application layout
issue #37, added documentation to my methods in the controller
Add devise (sign_in, sign_up, etc) routes
Remove erroneous migration
Add devise views
Add devise config and migration
Add custom registrations controller for devise