Issue #96 added UML, Sketch and docs
Saving my file
Issue #96 mailer configurations
Issue #96 Test files
Merge branch 'master' into C2_mohammad-abdulkhaliq_#96_approve_committee

Conflicts:
	sketches/S2.2_invite_member.jpg
Issue #96 Tests moved admin actions to users controller added filter
Merge branch 'master' of https://github.com/DevYah/coolsoft-13 into C2_mohammad-abdulkhaliq_#96_approve_committee

Conflicts:
	sketches/S2.2_invite_member.jpg
Merge branch 'C2_mohammad-abdulkhaliq_#96_approve_committee' of https://github.com/DevYah/coolsoft-13 into C2_mohammad-abdulkhaliq_#96_approve_committee
Issue #96 fixed indentation and tests
Issue #96 fixed tests, indentation and updated UML
Merge branch 'C1_AminaZoheir_#73_ViewNotifications' into C2_mohammad-abdulkhaliq_#96_approve_committee

Conflicts:
	Idearator/config/routes.rb
Issue #96 Gemfile from master
Revert "Issue #96 Gemfile from master"

This reverts commit 796aba5bb3d4dd0e1cbf2eef6579f0a5a40711f0.
Revert "Merge branch 'C1_AminaZoheir_#73_ViewNotifications' into C2_mohammad-abdulkhaliq_#96_approve_committee"

This reverts commit 2d47cd4467eb8af26136737ebfacec02071f26dd, reversing
changes made to c75c3f61a9970daea35604f05530f16fa2925768.
Merge branch 'C1_AminaZoheir_#73_ViewNotifications' into C2_mohammad-abdulkhaliq_#96_approve_committee

Conflicts:
	Idearator/UML/issue_73_load_notifications.png
	Idearator/UML/issue_73_view_all_notifications.png
	Idearator/app/assets/javascripts/application.js
	Idearator/app/assets/stylesheets/notification.css.scss
	Idearator/app/controllers/notifications_controller.rb
	Idearator/app/views/layouts/_navigation.html.erb
	Idearator/app/views/notifications/_count_notifications.html.erb
	Idearator/app/views/notifications/_view_all.html.erb
	Idearator/app/views/notifications/_view_notifications.html.erb
	Idearator/config/routes.rb
Revert "Merge branch 'C1_AminaZoheir_#73_ViewNotifications' into C2_mohammad-abdulkhaliq_#96_approve_committee"

This reverts commit 87b3cda810a8c7d32acb19507c30ce624deb1bfa, reversing
changes made to 672eb371ea167b1d0d1fce19ae2ed8eaf17d6fb9.
Issue #96 added notifications module scenario fixes
Issue #96 registration integration, notifications and scenario fixes

Moved to a new branch
Issue #96 gemfile fix
Merge branch 'master' into C2_mohammad-abdulkhaliq_#96_approve_committee_2

Mailer pending

Conflicts:
	Idearator/.rspec
	Idearator/Gemfile
	Idearator/Gemfile.lock
	Idearator/app/assets/javascripts/application.js
	Idearator/app/assets/javascripts/notification_polling.js.erb
	Idearator/app/assets/javascripts/notifications.js
	Idearator/app/controllers/admins_controller.rb
	Idearator/app/controllers/users_controller.rb
	Idearator/app/mailers/inviter.rb
	Idearator/app/models/user.rb
	Idearator/app/models/vote_count.rb
	Idearator/app/views/layouts/_navigation.html.erb
	Idearator/app/views/layouts/application.html.erb
	Idearator/app/views/notifications/_view_all.html.erb
	Idearator/app/views/users/show.html.erb
	Idearator/config/environments/development.rb
	Idearator/config/routes.rb
	Idearator/spec/controllers/users_controller_spec.rb
	Idearator/spec/spec_helper.rb