hello Context
Merge branch 'NewCore' of https://github.com/mvdandrieux/grandcentral into NewCore

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