zz
Merge branch 'master' of http://github.com/MagicCube/Platinum.git