Added getter and setter for the touchmode margin threshold
Merge branch 'master' of https://github.com/jfeinstein10/SlidingMenu
* Removed dependency on actionbarsherlock from library because it is no longer used in library
* Moved maps dependency to a separate slidingmenu-maps-support project. Users that need SlidingMapActivity will need to include this project in addition to the SlidingMenu library.
Enable menu toggle when sliding is disabled

mEnabled is used to check if mContent receives dragging events, shoud not be used to stop actions. 
if mEnabled is checked in scrollTo(int,int) method, side menu can still be called out by SlidingMenu.showMenu(), but the menu would be blank.
Merge pull request #189 from Appstrakt/master

Added getter and setter for the touchmode margin threshold
Merge pull request #315 from alfthomas/mapsupport

Remove ActionBarSherlock and Maps dependency from library
Merge pull request #335 from liruqi/patch-2

Enable menu toggle when sliding is disabled
Merge branch 'master' of github.com:jfeinstein10/SlidingMenu

Conflicts:
	library/project.properties