Merge origin/master

Conflicts:
	pages/template/index.html