Disable user zoom

Conflicts:
	index.html
Merge branch 'user-scalable' into CUS

Conflicts:
	index.html