changes to sales content
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/admin/settings.php
changes to sales content