Frank Zurla -- tweaks during final testing
Frank Zurla -- Change home screen layout & update new apts to correct time text
Merge branch 'master' of https://github.com/frankz4/CSE5324_Project

Conflicts:
	PHMS/gen/app/phms/R.java
	PHMS/res/layout/activity_search.xml
Frank Zurla -- change homescreen to scrollable view instead of static
Frank Zurla -- modify appointments date / time, modify articles, and update search to hide "all" for now
Frank Zurla -- add email to contact, add partipants to apts and meds for alerts, add email to database
Merge branch 'master' into mystuff