fixed mobile scrolling
Merge branch 'master' into dev

Conflicts:
	child.js