Changed external JAR libraries to local ones
Merge branch 'master' into laxderp