Fixed typo in uniform names
Merge remote-tracking branch 'origin/master' into ClubGameJam2014