stage fix
Merge branch 'master' into stage
another stage fix
yet another stage fix
post merge commit
Merge branch 'stage'

Conflicts:
	application/htdocs/public_html/index.php
more changes