more changes, improvements to templates/server
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/menu.html
	templates/menus_list.html
Merge remote-tracking branch 'origin/master'
more changes, improvements to templates/server