manifist
Merge branch 'master' of https://github.com/MohamedBassem/CSEN704 into integration

Conflicts:
	mobile/AndroidManifest.xml
	mobile/src/com/example/csen704/activity/LoginActivity.java
	mobile/src/com/example/csen704/fragment/AnnouncementsFragment.java
el donya 7elwa
Merge branch 'master' of https://github.com/MohamedBassem/CSEN704 into integration

Conflicts:
	mobile/res/layout/fragment_reminders.xml
	mobile/src/com/example/csen704/activity/LoginActivity.java
	mobile/src/com/example/csen704/fragment/AnnouncementsFragment.java
integrate annoucenments
Merge branch 'master' of https://github.com/MohamedBassem/CSEN704 into integration

Conflicts:
	web/Gemfile.lock
add gemfile.lock
Merge branch 'integration'

Conflicts:
	web/Gemfile.lock