whoops
layout
stuff

BattlescapeState: tweak console and use SDLkey "o" as toggle.
	- remove secondary color from battleinfo.
	- fix updateTurn()
	- put back btnReloadClick.
	- put Bar setMax() up to cTor instead of updateSoldierInfo()
	- rearrange functions
	- getters for UnitWalkBState
UnitWalkBState: when xCom_Faction unit walks, update only TU & Energy.
BasescapeState: align Region right.
Options: toggle "o" for console.

Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL
Conflicts:
	src/Battlescape/BattlescapeGenerator.cpp