TextArea bugfix & improvement
Options Menu missing text bugfix
Merge branch 'master' of github.com:vvbalashoff/falltergeist

Conflicts:
	src/States/SettingsMenuState.cpp
	src/UI/TextArea.cpp