Merge branch 'master' into ui

Conflicts:
	dxr/templates/layout.html
	format