Merge branch 'master' of https://github.com/nroduit/dcm4che.git
Merge branch 'master' of https://github.com/nroduit/dcm4che.git
Merge branch 'master' of https://github.com/nroduit/dcm4che.git
[#LIB-127] update to slf4j-1.7.5
[#LIB-128] update to junit-3.11
[#LIB-129] DicomServiceFactory: log DicomServiceException in onDimseRQ() with INFO level
[#LIB-129] DicomServiceFactory: log DicomServiceException in onDimseRQ() with INFO level
[#LIB-129] DicomServiceFactory: log DicomServiceException in onDimseRQ() with INFO level
[#LIB-123] Adjust XSL Stylesheets for XML->JSON to Supp 136 final text
Revert "[#LIB-129] DicomServiceFactory: log DicomServiceException in onDimseRQ() with INFO level"

This reverts commit bdbb454f3aaa4b0b1a86c04e40b31534408c2d10.
Revert "[#LIB-123] Adjust XSL Stylesheets for XML->JSON to Supp 136 final text"

This reverts commit 421ec2701b948d8ef1d8bbec76dd84db19daeecf.
Revert "[#LIB-123] Adjust XSL Stylesheets for XML->JSON to Supp 136 final text"

This reverts commit 421ec2701b948d8ef1d8bbec76dd84db19daeecf.
[#LIB-129] DicomServiceFactory: log DicomServiceException in onDimseRQ() with INFO level
[#LIB-131] Add initial Apache Camel integration
Apache Karaf specific files
Apache Karaf specific files
Merge branch 'master' of https://github.com/dcm4che/dcm4che.git

Conflicts:
	dcm4che-karaf/pom.xml
[#ARCH-57] Evaluate transformation to OSGI Enterprise Application
Merge branch 'master' of https://github.com/dcm4che/dcm4che
[#LIB-132] rename Issuer.issuerOfPatientID() to Issuer.fromIssuerOfPatientID()
[#LIB-133] add class org.dcm4che.data.IDWithIssuer