synchronization with library-service branch
Merge branch 'master' into ice-cream-sandwich
updated package name
Merge branch 'master' into ice-cream-sandwich
synchronization with library-service branch
Merge branch 'master' into ice-cream-sandwich
encoding "detection" for xml files
Merge branch 'master' into ice-cream-sandwich
imports cleanup
Merge branch 'master' into ice-cream-sandwich