Merge remote-tracking branch 'origin/master'

Conflicts:
	default.html
	style/DefaultStyle.css