Signed-off-by: claire921 <claire921@gmail.com>
Merge branch 'master' of https://github.com/claire921/dicks.git

Conflicts:
	HelloWorld/src/com/dicks/rules/evaluate.drl
merge
Merge branch 'master' of https://github.com/claire921/dicks

Conflicts:
	HelloWorld/src/com/dicks/pojo/Fee.java
Merge branch 'master' of https://github.com/claire921/dicks.git
Merge branch 'master' of https://github.com/claire921/dicks.git


Signed-off-by: claire921 <claire921@gmail.com>


Signed-off-by: claire921 <claire921@gmail.com>
Merge branch 'master' of https://github.com/claire921/dicks.git

Conflicts:
	HelloWorld/src/com/dicks/pojo/Product.java
	HelloWorld/src/com/dicks/pojo/Rule.java
	HelloWorld/src/com/dicks/pojo/Store.java
Merge branch 'master' of https://github.com/claire921/dicks.git

Conflicts:
	HelloWorld/src/com/dicks/pojo/Product.java


Signed-off-by: claire921 <claire921@gmail.com>
Merge branch 'master' of https://github.com/claire921/dicks.git

Conflicts:
	HelloWorld/src/Test/HibernateTest.java
	HelloWorld/src/com/dicks/engine/Product.java
	HelloWorld/src/com/dicks/engine/Rule.java
	HelloWorld/src/com/dicks/pojo/Fee.java
	HelloWorld/src/com/dicks/pojo/OrderDetail.java
	HelloWorld/src/com/dicks/pojo/Product.java
	HelloWorld/src/com/dicks/pojo/Rule.hbm.xml
	HelloWorld/src/com/dicks/pojo/Rule.java
	HelloWorld/src/com/dicks/pojo/Store.java
	HelloWorld/src/hibernate.cfg.xml
Merge remote-tracking branch 'origin/master'