Merge branch 'better-positioning'

Conflicts:
	intro.js
Merge branch 'better-resizing'
Merge branch 'number-positioning'