Merge branch '0.4.x' into 0.5.x

Conflicts:
	src/ui.cpp
	src/ui.h
	src/uibase.cpp
	src/xpm/about.xpm

diff --cc src/bitcoinrpc.cpp
Simple merge

diff --cc src/db.cpp
Simple merge

diff --cc src/main.cpp
Simple merge

diff --cc src/main.h
Simple merge

diff --cc src/wallet.cpp
Simple merge