Add Tourist friends function
Merge branch 'friends'
Merge branch 'master' of https://github.com/projetbacon/caketrek