t'es commit
Merge branch 'NewCore' of https://github.com/mvdandrieux/grandcentral into NewCore

Conflicts:
	grandcentral/field/template/wysiwyg.php