Sir Trevor link
Merge branch 'master' of https://github.com/mvdandrieux/grandcentral

Conflicts:
	grandcentral/core/system/_attr/attrUrl.php