Merge pull request #14 from Factionwars/master

Dev up to speed
Merge pull request #15 from Factionwars/development

Merge pull request #14 from Factionwars/master