Calculate common ancestor on server.
Change data model.
Merge branch '2.1'

Conflicts:
	common/commit-mgr.c
	common/commit-mgr.h
	common/diff-simple.c
	common/rpc-service.c
	daemon/sync-mgr.c
	lib/commit.vala
	server/repo-op.c