Merge branch 'master' into C2_mohammad-abdulkhaliq_#46_invite_member

Merge with master then invite member controller action and button.
Conflicts:
	Idearator/Gemfile
	Idearator/Gemfile.lock
Merge branch 'C2_mohammad-abdulkhaliq_#96_approve_committee' into C2_mohammad-abdulkhaliq_#46_invite_member

Plus UML, Docs for invite_member and updated code, fixed incorrect message in notification view.
Conflicts:
	Idearator/Gemfile
	Idearator/app/controllers/admins_controller.rb
	Idearator/app/views/users/show.html.erb
	Idearator/config/routes.rb
Issue #46 updated controller actions
Issue #46 changed notification sequence and added test descriptors
Issue #95 .rspec file

Most of the previous committs referenced Issue #46 which is incorrect the correct no. is 95
Issue #95 tests and changed location of actions to users contoller
Merge branch 'C2_mohammad-abdulkhaliq_#46_invite_member' of https://github.com/DevYah/coolsoft-13 into C2_mohammad-abdulkhaliq_#46_invite_member
Merge branch 'C1_AminaZoheir_#73_ViewNotifications' into C2_mohammad-abdulkhaliq_#46_invite_member

Issue #95 fixed notificatons modal scenario and adjusted notifications sequence

Conflicts:
	Idearator/app/views/notifications/view_notifications.html.erb
	Idearator/config/routes.rb
Issue #95 made information about invitation acceptance viewable in notifications
Issue #95 fixed indentation, tests, updated UML

Small fixes to scenario
Merge branch 'master' into C2_mohammad-abdulkhaliq_#46_invite_member
Issue #95 fixed notifications, and merged with master
Issue #95 master gemfile
Issue #95 few fixes
Issue #96 ajax attempt
Issue #96 ajax attempt, added route
Issue #95 removed unwanted code from load_notf
Issue #95 fixed ajax request
Issue #95 added js.erb view in users
Issue #95 fixed committee already chosen his tags sce