Slightly changed syntax of Entity-DSL ('collection' instead of 'contains').
Fix one-to-many and support one-to-one. (Note: currently cannot have uni-directional one-to-one!)