content page generation refactored
Merge branch 'master' of https://github.com/eshikerya/localnet

Conflicts:
	data/content.yaml