Updates for Jan 7
Merge branch 'master' of https://github.com/atesh/XKit

Conflicts:
	Extensions/xkit_patches.js