Added skeleton for forms and encounters in the JSON.
Merge branch 'master' of https://github.com/openmrs/openmrs-module-chartsearch

Conflicts:
	api/src/main/java/org/openmrs/module/chartsearch/solr/ChartSearchSearcher.java