clean
Merge branch 'master' into v0.6.3

Conflicts:
	content/sub/some.md
	themes/default/special.html
fix Layout support
fix Layout support
 Improve meta tag display in templates