Merge UI and 0.9.3 changes to bitcoingui.cpp/h