[maven-release-plugin] prepare for next development iteration
Merge branch 'release/v2.0.0' into develop
Merge branch 'hotfix/priv-fix' into develop

Conflicts:
	api/pom.xml
	omod/pom.xml
	pom.xml
Updated openhmis dependences to current SNAPSHOT version.
webservices 2.6 #inv-132 Fixed
Merge branch 'develop' of https://github.com/OpenHMIS/openmrs-module-openhmis.cashier into develop
webservices 2.6 #inv-132 Fixed
configurable adjustment reason field #cash-148 Fixed
Fixes for issues loading modules during startup
	Updated the base class of the activator
	Removed unneeded activator methods
	Updated version numbers of referenced modules
Merge branch 'develop' of github.com:OpenHMIS/openmrs-module-openhmis.cashier into develop

Conflicts:
	omod/src/main/resources/config.xml
Fixed a typo in the adjustment reason field property.
Updated resources and searches to support 1.10.
fix to update total when selecting item through mouse click
adjust bill can now be posted #cash-174 Fixed
itemPrice posted #cash-170 Fixed
allow null for price_id
catch exceptions etc if price is deleted but used in bill
small error fixings on bill page
fix payments issue for adjusting bill
Updated ignore file to ignore java-version file.