Fix NPE when opening MusicFolderListActivity.

Options menu items only exist if mFolder != null.
Prepare for release 1.1.1.
Merge branch 'release-1.1.1' into develop

* release-1.1.1:
  Prepare for release 1.1.1.