General tweaks
Merge remote-tracking branch 'origin/master'

Conflicts:
	Mobile/internal2.html
	Tablet/index.html