Updated network code.
Merge branch 'master' of github.com:rbuenviaje-mdsol/mpatient

Conflicts:
	AndroidManifest.xml
	src/com/mdsol/mpatient/Alarm.java