Updated database
Merge pull request #12 from rmcdole/master

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