Updated database
Merge remote-tracking branch 'upstream/master'
Fixed parts of SQLHandler and got a button in settings to work