Update.
Merge branch 'master' of github.com:matthias-springer/tode-web-amber

Conflicts:
	js/Canvas.js