Better showing/hiding of tray
Merge branch 'master' into eve

Conflicts:
	src/design/design.js