micky
micky
merge
Merge branch 'master' of https://github.com/claire921/dicks

Conflicts:
	HelloWorld/src/com/dicks/rules/newRule.drl
	HelloWorld/src/com/dicks/rules/newRule_joe.drl
	HelloWorld/src/com/dicks/rules/newRule_withGroup.drl
	HelloWorld/src/com/dicks/rules/test.drl
	HelloWorld/src/com/dicks/rules/test_struct.drl
	HelloWorld/src/hibernate.cfg.xml