Merge branch 'master' of /Users/andylee/Documents/Android_Studio_Working_Folder/SEED_System/EECS481-SEED with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	SEEDForAndroid/app/src/main/java/edu/umich/seedforandroid/patient/fragments/myhealth/MyHealth_ViewData_Frag.java
Nov 19, 2014 1:40 AM Andy Lee
ViewData Frag Changes