Updated Android App

It now works with the new web service. Also added copies of all the
EntitiesUnmapped so json works