test
Merge branch 'master' of github.com:metrafonic/CouchDroid

Conflicts:
	.travis.yml