a bunch of work on the planning for the tourguide
Merge branch 'master' of https://github.com/katadh/leiaS14