jh: 404 page people additions
Merge branch 'master' of https://github.com/leobauza/saforian

Conflicts:
	js/inline.js