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

Conflicts:
	grandcentral/sirtrevor/system/js/sir-trevor.min.js
	grandcentral/sirtrevor/template/block/code.php
	grandcentral/sirtrevor/template/block/heading.php
	grandcentral/sirtrevor/template/block/image.php
	grandcentral/sirtrevor/template/block/list.php
	grandcentral/sirtrevor/template/block/text.php
	grandcentral/sirtrevor/template/block/video.php
	grandcentral/sirtrevor/template/field/custom-blocks/Code.js
	grandcentral/sirtrevor/template/field/custom-blocks/ImageCaption.js