Adjust composer
Adjust connection class
update the controller to use try/catch statements
Clean up the test since we dont have now the executeCommand method
update the test
Merge branch 'master' into WK-731

Conflicts:
	.idea/afterbuyapi.iml
	.idea/workspace.xml