cmake: fix determination of Python install directory
java: properly extend JComboBox
Merge branch 'master' into pkstring

Conflicts:
	lib/swig/java/AbilityListComboBox.java
	lib/swig/java/NatureListComboBox.java
	lib/swig/java/PokemonListComboBox.java
	lib/swig/java/TypeListComboBox.java
	lib/swig/java/VersionListComboBox.java