- CDSA's upgraded to drools 5.6.0
Merge branch 'master' of github.com:SocraticGrid/sg-agents

Conflicts:
	pom.xml