Added menu items sort
Merge branch 'ekotester' into ekotester-with-products
Fix apple