conflicts fixed
Merge branch 'develop'
Merge branch 'master' of github.com:niomaster/eca-rule-engine

Conflicts:
	src/examples/barchart.ECA
imports fixed