Merge branch 'master' of github.com:dellsystem/mcmun-2014
Fix order of awards in slideshow