OptionsMenuState
Merge branch 'master' of https://github.com/dadamitskiy/WarInParadise

Conflicts:
	WarInParadise/source/Game States/OptionsMenuState.cpp
Merge branch 'master' of https://github.com/dadamitskiy/WarInParadise
OptionsMenuState
Merge branch 'master' of https://github.com/dadamitskiy/WarInParadise
OptionState corrections and MainMenuState loading configs
Merge branch 'master' of https://github.com/dadamitskiy/WarInParadise

Conflicts:
	WarInParadise/WarInParadise.vcxproj.filters