added test for capabilities
Merge remote-tracking branch 'origin/exp' into exp

Conflicts:
	server/capability/capability_test.go