Fixed persistant typo

Fixed a persistent typo with persistant.
Move obsolete code to correct location

Scouts should now obsolete at Metal Casting.
Removed units from tech tree.

Removed anti-tank gun and marine from tech tree.
Conquistador

The new 'dummy' unit replaces the existing unit once religion spread
becomes critical. This hopefully will fix the dying in enemy territory
when it is used as a military unit.
HanseaticLeague fix

Bismark should now receive their 3 extra World Congress votes
Minor version update

For next release so we don't need to worry about it.
Merge pull request #163 from Thalassicus/stable

Merge branch stable into new-features