FIXED DB STUFF
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
fixing table view for multi selection