Arcade build perhaps
Bug Fixes
Merge branch 'master' of https://github.com/dadamitskiy/WarInParadise

Conflicts:
	WarInParadise/Options.txt
	WarInParadise/source/Game States/GameplayState.cpp
Bug Fixes, Prepull Merge
Controls fixes, prompt fixes, combat fixes
Merge branch 'master' of https://github.com/dadamitskiy/WarInParadise

Conflicts:
	WarInParadise/source/Game States/GameplayState.cpp
Prepull merge push