added guava.
Merge branch 'develop' of https://github.com/Citytechinc/bedrock into develop
fixed maven warnings and cleaned up groovy code.