Add guacamole-example, modified to work with 0.8.*
Merge branch 'master' into unstable