Beverages content update, reordered pickup categories.
Merge branch 'master' of https://github.com/brycecall/catering

Conflicts:
	pickup/categories.xml