db connection, expander gui,
Merge remote-tracking branch 'origin/master'