Merge tag '1' into develop

1
Set 2-SNAPSHOT version.
Update to wisdom 0.7-SNAPSHOT and guava 18
ignore
release 2
Merge branch 'release/2'