made tray name tray from tray1
Merge branch 'master' of https://github.com/lorenzoriano/OpenRaving