Merge branch 'andrey' of https://github.com/rodinandrey/guids into andrey

Conflicts:
	class/class.vars.php