"Update prod2 server url to secure3.psgam.co.za from production2.psgam.co.za"
Did merge to master for Tax Statements
Add maintenance warning for master
fixed date of maintenance
changing production2 to use UAT Repository for testing
remove maintenance message
remove maintenance message
remove maintenance message
change production2 to prod environment
change production2 to uat environment
change production2 uat environment database password
changed maximum value of textboxes up to 99 billion
Merge branch 'master' into uat

Conflicts:
	app/controllers/contract/contract_controller.rb
	lib/tax_statements.rb