Merge branch 'gh-pages' of github.com:robotology/funny-things into gh-pages