sync with ics branch
Merge branch 'master' into multidirs
static method
updated BookCollection class from library-service branch
Merge branch 'master' into multidirs