modified
Merge branch 'master' of https://github.com/nr4bt/swipemenu

Conflicts:
	app/src/main/java/com/orhanobut/android/swipemenu/WorldObject.java