Merge remote-tracking branch 'github/master'

Conflicts:
	templates/_includes/navigation.html
	templates/_includes/sidebar.html