Update travis conf for working with asdk r22 and gradle
Merge branch 'dev' of https://github.com/Prototik/ActionBarSherlock into Prototik-dev

Conflicts:
	build.gradle