removed --database.force-sync-shapes option
share basic shape types
fixed test
removed shape collections
fixed test
shape upgrade
do not access shaper but use memory zone variable
indent
Merge remote-tracking branch 'origin/devel' into inline-shapes

Conflicts:
	arangod/VocBase/document-collection.c
don't complain upon usage of obsolete --database.force-sync-shapes option
indentation
shape migration
Merge remote-tracking branch 'origin/inline-shapes' into devel