Fix canvas size bug in non-retina display
Merge branch 'v2'

Conflicts:
	build/js/main.js