combine place order
Merge branch 'master' of https://github.com/claire921/dicks.git

Conflicts:
	HelloWorld/src/com/dicks/engine/Split.java
Merge remote-tracking branch 'origin/master'

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

Conflicts:
	HelloWorld/src/com/dicks/engine/CreateTemplate.java
Merge branch 'master' of https://github.com/claire921/dicks.git
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>
Merge branch 'master' of https://github.com/claire921/dicks.git

Conflicts:
	HelloWorld/src/com/dicks/action/CreateNewBizRule.java
	HelloWorld/src/com/dicks/engine/CreateTemplate.java


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