adding third party jars
Merge remote-tracking branch 'upstream/master'