Merge branch 'master' of git://github.com/6wunderkinder/android-sliding-layer-lib into feature/updown
And fixed x/y conflicts of fling events.

Conflicts:
	Library/src/com/slidinglayer/SlidingLayer.java

Conflicts:
	Library/src/com/slidinglayer/SlidingLayer.java