Update Guava verion
Merge branch 'develop'