Bugs
Merge branch 'master' of https://github.com/mvdandrieux/grandcentral

Conflicts:
	grandcentral/field/template/app.html.php
	grandcentral/field/template/js/app.js
	grandcentral/sirtrevor/system/attrSirtrevor.php
	grandcentral/sirtrevor/system/js/imagegc.js
	grandcentral/sirtrevor/template/sirtrevor.php