Xcom 2012 rules of research.
advanced options strings
checking brackets
just one space
typo
fix: rare crash placing new bases

Crashes can occur in two cases:
1) If a mouseover triggers between base being named and
BuildNewBaseState destructor call.
2) If a mouseover triggers between confirm new base cancellation and
BuildNewBaseState destructor call.

Solution is to swap between globeHover handler and an empty handler as
necessary.
updated Polish.lng
Avoid conflict scr/Engine/Options.cpp
Merge branch 'master' into xcom_2012_research
comatibility with "Cancel Project"
zero handler

Forget using an empty handler, you can simply zero it.
bin/data/Language/Polish.lng

STR_SACK
ZWOLNIJ
changed the description of the option
updated Polish.lng
Merge pull request #549 from redv/xcom_2012_research

Feature: XCom 2012 research rules
Merge pull request #559 from radius75/Polish.lng

bin/data/Language/Polish.lng
missing include

Fixes bug 180
Merge pull request #562 from cfailde/include

missing include
Merge pull request #554 from cfailde/newbase

fix: rare crash placing new bases
Merge remote-tracking branch 'upstream/master' into alien-research-in-containment

Conflicts:
	src/Basescape/ResearchInfoState.cpp