Merging with development
Merge branch 'development'
Changing database settings