added target update-disclaimer
updated disclaimer
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

Conflicts:
	arangod/VocBase/collection.c