Merge branch 'extras'

Conflicts:
	npcs/bearinabowtie.kv
	npcs/middleunicornman.kv
	util/package.bluej