no message
Merge remote-tracking branch 'github/master'

Conflicts:
	src/com/medianet/kit/Kit.java