Update

Update
Merge branch 'master' of https://github.com/jsant096/coplat

Conflicts:
	.idea/workspace.xml
	protected/runtime/application.log