Fix catacurse.h compilation with the new ui.cpp
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into no-plantbeasts