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.
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 branch 'master' of git://github.com/jfeinstein10/SlidingMenu

Conflicts:
	library/project.properties