[Viking] WIP merging Fortress with CC

UNTESTED!
Merge branch 'master' of https://github.com/MillenniumAD/millenniumad

Conflicts:
	simulation/templates/units/viking_infantry_archer_b.xml
	simulation/templates/units/viking_infantry_spearman_b.xml
	simulation/templates/units/viking_infantry_swordsman_b.xml

Fixing a git error