fix
Merge branch 'master' of https://github.com/DenLinker/Gear

Conflicts:
	library/GProxyCollection.php