temp commit (ruby version, gem cleanup)
allow for 99,999,999,999.00 in amount fields
Merge branch 'master' into develop

Conflicts:
	public/javascripts/autoNumeric-1.7.1.js
Merge branch 'uat' into develop

Conflicts:
	app/controllers/contract/contract_controller.rb