working on page contents and layout
Merge branch 'master' of github.com:amorgner/neo4j-org

Conflicts:
	helpers/pages.js
	views/partials/article/_tile.ejs
	views/partials/default/_tile.ejs
	views/partials/image/_tile.ejs
	views/partials/page.ejs
	views/partials/page/_tile.ejs
	views/partials/track/_tile.ejs
	views/partials/video/_tile.ejs