new version 1.2.1

Conflicts:
	html5-quick-template.html.php