Merge branch 'base'

Vibration menu item is now togglable

Conflicts:
	seascene.cpp

diff --cc seascene.cpp
index 1eec000,480c99e..7adf58a
--- 1/seascene.cpp
--- 2/seascene.cpp
+++ b/seascene.cpp
@@@ -461,9 -439,9 +457,10 @@@ void SeaScene::handleScreenTapped(
  
      clearSelection();
  
-     //The user propably went to paused state just to access menu, so unpause
-     //unless status bar was requested
-     if (pItem != pMinimizeItem_)
+     //The user propably went to paused state just to access menu, so unpause unless vibration set (so the user sees its changed)
++    //or unless status bar was requested
++    if (pItem != pMinimizeItem_ || pItem != pSettingsItem)
+ 
 -    if (pItem != pSettingsItem_)
      {
          pPauseAction_->setChecked(false);
      }