Merge pull request #6 from Ben-Angel/master

sync
added different tree formats
Merge branch 'master' of https://github.com/oat-sa/tao-user-guide
Merge pull request #4 from oat-sa/master

added maps