printr
Merge branch 'NewCore' of https://github.com/mvdandrieux/grandcentral into NewCore

Conflicts:
	grandcentral/core/system/_attr/attrMedia.php
conflict
merge commit
Merge branch 'master' of https://github.com/mvdandrieux/grandcentral