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

Conflicts:
	library/GFolder.php