Article and environment changes
Env fixes
Bug fixes
Bug fixes for nav and listing
Merge branch 'cycle'

Conflicts:
	site/app/helpers.php