Merge remote-tracking branch 'origin/master'

Conflicts:
	service/templates/index.html