3.1.2 - fixed and shift-space combo

New features
- add support for key combo shift+space (same as pageup) - thanks to zcourts - close #132

New options
- enablemouselockapi:true, disable setCapture implementation, when you need native scroll on dragging object out of a div - close #134

Fixes
- when autohidemode=false cursor opacity not set to value cursoropacitymax - close #137
- scrolling position not fixed when zooming out and positioned at bottom - close #136
- remove function, some events remains bind to element - close #139

jquery.nicescroll.js

@@ -1308,12 +1308,7 @@
           
           if (self.hasfocus||(self.hasmousefocus&&!domfocus)||(self.ispage&&!domfocus&&!mousefocus)) {
             var key = e.keyCode;
-<<<<<<< HEAD
             
-=======
-            var ctrl = e.ctrlKey||false;
-            var shift = e.shiftKey || false;
->>>>>>> origin/master
             if (self.locked&&key!=27) return self.cancelEvent(e);
 
             var ctrl = e.ctrlKey||false;
@@ -1367,11 +1362,7 @@
                 break;
               case 32:
                 if (self.opt.spacebarenabled) {
-<<<<<<< HEAD
                   (shift) ? self.doScrollBy(self.view.h) : self.doScrollBy(-self.view.h);
-=======
-                  shift ? self.doScrollBy(self.view.h):self.doScrollBy(-self.view.h);
->>>>>>> origin/master
                   ret = true;
                 }
                 break;