reformat
Merge remote-tracking branch 'origin/master'
hide is connected on db