Massive changes including updates to patient and characteristic facets as well as android app. Cleaned up binary objects that should not have been in git.