Merge branch 'master' of https://github.com/phaed420/SimpleClans
Merge branch 'master' of https://github.com/stutiguias/SimpleClansLite