Merge branch 'master' of github.com:dellsystem/mcmun-2014
Update merchandise shop dates