Merge origin/master

Conflicts:
	application/controllers/canvasConfig.php
	application/views/v_navigation.php