Added shipment functionality
Merge branch 'development' of https://github.com/ctorok/AngelHack_GA_2013 into development