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