More of workflow done
Merge branch 'master' of https://github.com/molisani/sfs_mobile.git

Conflicts:
	sfs_mobile/res/values/strings.xml
	sfs_mobile/src/edu/upenn/cis350/sfs_mobile/AppointmentListActivity.java