Upgrade templates to be compatible with Cilantro 2.3.8

This follows the conventions of the Harvest OpenMRS demo repository(demo branch).
Fixed serrano bug