commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/site.php
	application/views/footer.php
	application/views/head.php