new version of guava
Merge commit '888ec581cd3ec2d5622920043a5373ebf56f1b3e' into develop
updated templates to new guava version