Improvements for integration in the website.
Merge branch 'master' of github.com:roeles/ciao