Master : this is the end
Merge branch 'NewCore' of https://github.com/mvdandrieux/grandcentral into NewCore

Conflicts:
	grandcentral/content/template/master/master.php