e
Merge branch 'master' of https://github.com/komelio/coko-framework

Conflicts:
	core/pom.xml