Fix crash in options menu for pre honeycomb devices

Fix crashed which occurs when opening the options menu after a context menu
have been opened.
This error only occurs when running the action bar comptibility code, ie.
on with android versions before 3.0.
We are now using menu resources for context menus, causing inflate to be called
when the context menu are displayed. The compatibility code then had the wrong
data for options menu, and crashed when trying to show/hide menu items, to
reflect whether the controlled squeezbox player was on or off.
Album sort order changes

-Load the preferred album sort from the server
-Load the localized album sort strings from the server
-Add artistalbum, yearalbum and yearartistalbum (supported since version 7.3)
Merge commit 'd73eb89a388cbf9a05b62da835d494d2befc4c39' into actionbar

* commit 'd73eb89a388cbf9a05b62da835d494d2befc4c39':
  Fix crash in options menu for pre honeycomb devices
Merge commit '07563360a19fb513b3f1c621f7d7fdc638a410b5' into actionbar

* commit '07563360a19fb513b3f1c621f7d7fdc638a410b5':
  Album sort order changes