more uriBuilder work + metadataStore.onServer property
more toJSONExt work
Merge remote-tracking branch 'upstream/master'

Fixed conflict in src\a40_entityMetadata.js