added lib and modified classpath
Merge remote-tracking branch 'remotes/origin/lib'