Last of the fixes and updates to viewactivity.
Merge branch 'master' of https://github.com/tianyupu/MediTrack.git