Updating jars
Merge branch 'develop'