job
Merge branch 'master' of github.com:rc21net/Xorc

Conflicts:
	Model/UserAbstract.php