MIUP
Merge branch 'master' of https://github.com/cupdir/xmcode

Conflicts:
	service/core/plugins/x.service.core.plugins.svn