Merge pull request #6 from dieg0-/master

Merging
Updating orders status lists
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/petiteargen/mas-2014ws-project
Updating order status
Clean up code
Fixed errors in xml generation
Robot XML
Merge remote-tracking branch 'upstream/master'
Merge pull request #11 from petiteargen/master

Merge :)