updated views
Merge branch 'updated-views'

Conflicts:
	controllers/DefaultController.php
	views/default/index.php
	views/default/settings.php