Merge pull request #2 from Factionwars/master

Get up to speed
Merge pull request #3 from Factionwars/development

Merge pull request #2 from Factionwars/master