Merge pull request #114 from xxMUROxx/master

Renamed x:Name to avoid ambiguous names
New: CivCraft