name collision
Merge branch 'master' of github.com:kre/Kinetic-Rules-Engine