Merge branch 'orm_metadataStore' of https://github.com/ericdill/metadataStore into orm_metadataStore
Merge remote-tracking branch 'canon/orm_metadataStore' into orm_metadataStore

Conflicts:
	dataBroker.conf
	sample_code_userapi.py
Merge branch 'orm_metadataStore' of https://github.com/ericdill/metadataStore into orm_metadataStore
Fixed descriptor_name vs. event_type_name ambiguity. Added type verification to scan_id for both create() and search()
Merge remote-tracking branch 'origin/orm_metadataStore' into orm_metadataStore

Conflicts:
	sample_code_userapi.py