Updated OrderService

Made some updates to OrderService to get it working.
Merge branch 'master' of https://github.com/BlightOfYou/a2