Merge remote-tracking branch 'origin/templates'

Conflicts:
	templates/bootstrap.tpl