2013-0921 ClientBeta changes
Merge branch 'master' of https://github.com/Efreak/PixelVision