#123: Improve draw with 'focus view' on click.
Merge branch 'master' into 124

Conflicts:
	app/js/cdl.js
	app/js/config.js