fixed
Merge branch 'master' of https://github.com/hmuni006/coplat

Conflicts:
	protected/runtime/application.log