Database settings
Merge branch 'master' of https://github.com/ZuZuK/zuzuk

Conflicts:
	gradle/wrapper/gradle-wrapper.properties