RCP: tree modifications
Merge branch 'wincornixdorf' of https://github.com/opcoach/restaurant into wincornixdorf