Merge branch 'master' of github.com:dellsystem/mcmun-2014
Add feature for finalising merchandise orders

Also improved the admin display page for item orders (but not bundle
orders because whatever)
Merge branch 'master' of github.com:dellsystem/mcmun-2014