changes
Merge branch 'master' of http://github.com/JCPlusPlus/CommunityGame
changes