commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/view.php
	application/models/viewmodel.php