Merge pull request #553 from cornels/master

Update Romanian.lng
Merge pull request #550 from cfailde/confirmation

fix: confirming dismantle facility
Merge pull request #551 from cfailde/bindings

Add keyOk and keyCancel to more screens
Merge pull request #544 from redv/delete_8th_base

fix: Not restored the button "NewBase" when you delete the 8th base.
Merge pull request #540 from cfailde/options

Load options.cfg with -user parameter
Merge pull request #547 from cfailde/includes

Unnecessary includes
bin/data/Language/Polish.lng

STR_TIME_UNITS_RESERVED_FOR_KNEELING
Zarezerwowano PR na przyklęknięcie
STR_TUS_RESERVED_FOR_KNEELING_AND_FIRING
Zarezerwowano PR na przyklęknięcie i ostrzał
STR_RESERVE_TUS_FOR_KNEEL
Rezerwuj PR na przyklęknięcie
STR_EXPEND_ALL_TIME_UNITS
Wykorzystaj wszystkie posiadane PR
Merge pull request #555 from radius75/Polish.lng

bin/data/Language/Polish.lng
new option: in-research aliens take containment
add new string to language_id.html
updated Polish.lng
Avoid conflict scr/Engine/Options.cpp
Merge branch 'master' into xcom_2012_research
comatibility with "Cancel Project"
add Polish translation; thx radius75!
Merge pull request #552 from redv/fix_psi_attack

fix: Psi attack
Merge pull request #536 from Phezzan/craftSellCost

Craft Buy/Rent/Sell value is entirely moddable.
Merge pull request #546 from redv/icon_of_facility

Feature: uses icons of facilities in the BaseState as shortcuts.
THERE'S the memory, lebowski, are you happy now?
Missing includes