11
Merge origin/master

Conflicts:
	src/kkinfo.xml
11