controllers/views
Merge branch 'master' of github.com:marmotasystem/cantv

Conflicts:
	application/views/layout.php