Fix singleplayer dialogs missing game customization
Split declaration of GenericCAO from implementation
Merge commit '87b4bce' into merge3
Merge commit 'd9f6f9e' into merge3

Conflicts:
	src/content_cao.cpp