Add some json function
Merge branch 'master' of https://github.com/alexfz420/DSG.git

Conflicts:
	DSG/smallTest.log
	DSG/src/com/dicks/engine/Allocate.java
	DSG/src/com/dicks/engine/PackageE.java


Signed-off-by: claire921 <claire921@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	DSG/smallTest.log
	DSG/src/com/dicks/dao/ShipmentDAO.java
	DSG/src/com/dicks/engine/Util.java


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

Conflicts:
	DSG/smallTest.log