bumping versions updating CHANGELOGs

Conflicts:
	erp_app/CHANGELOG
	erp_app/lib/erp_app/version.rb
	erp_tech_svcs/lib/erp_tech_svcs/version.rb