Merging POA hackathon work into openmrs master