jolo
Merge branch 'jolo'

Conflicts:
	pm - Kope.xml