Version 3.6 final

- Menu fixes