synchronization with library-service branch
updated package name
synchronization with library-service branch
encoding "detection" for xml files
imports cleanup