Bug fix #141 Billing Reconcilliation summary total amount doubled
Merge branch 'master' of ssh://github.com/oscarEmr/oscar12.1.1

Conflicts:
	src/main/webapp/billing/CA/ON/onGenRASummary.jsp