Revert "Modified the xml layout"

This reverts commit 4ce3655e8240f0cabc1bda8da2771d1f4e0d826e.
Modify xml struct to match code...
Merge branch 'master' of https://github.com/thefluxster/lca-api-tests

Conflicts:
	ui/guided-tour-resource.xml