gradle build
Merge branch 'master' of github.com:b0m0x/SlidingMenu

Conflicts:
	.gitignore
	.project
	library/pom.xml
	pom.xml
	project.properties
	src/com/slidingmenu/lib/app/SlidingMapActivity.java