Merge pull request #2 from devcritter/master

csd_base_stored_queries: Added filter_by_otherid for organizations and f...
added connect-a-thon sample directories
Enabled service directories to be merged
Fixed bug in csd_lsc:refresh_doc where organization updates were affecting the provider registry
Minor formatting changes
Altered the merge to merge all docs registered with the document manager rather than only cached services
Merge pull request #3 from his-interop/merge-cache

Merge cache
changed location of csd_msc.xqm module in csd_dm.xqm
updated curl request information for test documents
main careServicesRequst page show a list of the registered functions
comment out merge when a document is registered
fixed issue with displaying list of registered careServiceFunctions
fixed references to module locations in csd_mcs
Renamed merge cached services to merge registered docuemnts and removed megre calls from the document manager
fixed issue in base library where we are filtering by modification date. THIS NEEDS A CP
added endpoint for updating functions/seperated out updating and non-updating stored functions.  follow https://www.mail-archive.com/basex-talk@mailman.uni-konstanz.de/msg03562.html so that the updating/non-updating functions can be at the same endpoint
put in proper HTTP binding to retreive a SVS (no version or lanuage supported yet)
merged in (I hope) merge-cache branch
comment out inclusion of openinfoman-pr stored function library  by default
added support for SVS RetrieveMultipleValueSet HTTP option.  SVS RetreiveValueSet now should have the correct wrapper
added namespaces to SVS responses
Fixed issues with filtering by commonName, name, etc where there are multiple elements. CP NEEDED