various fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	inc/jquery.mb.scrollax.js