sdf
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/ruleTxt/newRule.drl
	test/smallTest.log