add tabs for generic, layout, vertex, edge
Merge remote-tracking branch 'origin/master'

Conflicts:
	server.R
delete sth