add guava to project
Merge origin/master