TGBGfb

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

Conflicts:
	HelloWorld/src/com/dicks/engine/Allocate.java
	HelloWorld/src/com/dicks/engine/OrderE.java
special route template revised
Merge branch 'master' of https://github.com/claire921/dicks.git

Conflicts:
	test/bin/.gitignore