database settings
Merge branch 'database_fix'

Conflicts:
	.idea/workspace.xml