Merge branch 'NEW_UI' of https://github.com/phelow/FallOfTheTzar

Conflicts:
	FallOfTheTzar/FallOfTheTzar.userprefs
Merge branch 'master' of https://github.com/phelow/FallOfTheTzar

Conflicts:
	FallOfTheTzar/FallOfTheTzar.userprefs