...
...
Merge branch 'master' of https://github.com/mnbnet/karavan

Conflicts:
	protected/extensions/eckeditor/assets/plugins/styles/styles/default.js