Tray things
Merge branch 'develop' of https://github.com/foens/LegoSorter into develop