Fixed crash on exit from bookmarks and help activities
Merge branch 'master' of https://code.google.com/p/orion-viewer