change settings
travis debug

Conflicts:
	build.xml
Merge branch 'develop' into travis_debug

Conflicts:
	.travis.yml
Dump with --no-privileges