change scale for iphone 4 (temporary)
Merge remote-tracking branch 'origin/version_2' into version_2

Conflicts:
	index.html