fix travis
Merge remote-tracking branch 'origin/master'

Conflicts:
	library/build.gradle
fix travis