master commit
adding context
master change
Merge branch 'stage'

Conflicts:
	application/htdocs/public_html/index.php
more changes
even more
dev change 1
another dev change