Merge branch 'master' of
https://github.com/batmaster/OrderTrackingService

Conflicts:
	.classpath
	derby.log
	src/shop/resource/OrderResource.java
Merge remote-tracking branch 'origin/master'