Merge branch 'develop'

Conflicts:
	ht/runhippo.sh
Merge branch 'master' of github.com:antonyh/hippo-site-nucleus

Conflicts:
	ht/runhippo.sh