added alerts/notifications

can’t test it well
nothing really...

yep
Merge branch 'master' into sammyh

Conflicts:
	mobile/src/main/java/com/watsonsid/SampleApplication.java
	mobile/src/main/java/com/watsonsid/activities/watsonsid/DoctorHome.java

mobile/src/main/java/com/watsonsid/activities/watsonsid/GraphActivityNoN
av.java

mobile/src/main/java/com/watsonsid/activities/watsonsid/PatientHomeActiv
ity.java
fixed merge stuff, alerts
fixed things on graphs
Merge branch 'sammyh'

why