Issue #96 added UML, Sketch and docs
Saving my file
Issue #96 mailer configurations
Issue #96 Test files
fixed conflicts in app layout
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
Deleted apps task file
Removed conflicts in app layout
Fixed indentation in user.css
Merge branch 'C1_mennaamr_#91_Facebook_login' of github.com:DevYah/coolsoft-13 into C1_mennaamr_#40_Registration
Merge branch 'C1_mennaamr_#40_Registration' of github.com:DevYah/coolsoft-13 into C1_mennaamr_#40_Registration
Fixed User Model
Fixed indentation in callbacks controller
Merge branch 'C1_mennaamr_#91_Facebook_login' of github.com:DevYah/coolsoft-13 into C1_mennaamr_#40_Registration
Merge branch 'master' of https://github.com/DevYah/coolsoft-13 into C2_mohammad-abdulkhaliq_#96_approve_committee

Conflicts:
	sketches/S2.2_invite_member.jpg
Fixed syntax error in user model
Merge branch 'C2_mohammad-abdulkhaliq_#96_approve_committee' of https://github.com/DevYah/coolsoft-13 into C2_mohammad-abdulkhaliq_#96_approve_committee
Updated migration files
Issue #96 fixed indentation and tests