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

Conflicts:
	grandcentral/sirtrevor/system/js/sir-trevor.js