Merge remote-tracking branch 'origin/fix_ui_bugs'

* origin/fix_ui_bugs:
  Fixed various minor bugs
Merge remote-tracking branch 'origin/129-fix-layer-table-on-error'

* origin/129-fix-layer-table-on-error:
  Remove layer from table if reading file fails
Merge remote-tracking branch 'origin/134-show-info-on-dblclick'

* origin/134-show-info-on-dblclick:
  show map info with double click
Set staticdata dir appropriately based on the argument
Merge remote-tracking branch 'origin/fix_server_conf' into next

* origin/fix_server_conf:
  Set staticdata dir appropriately based on the argument