Improved version of 23241c0bbd7f9ff727a935c1b936486a28d3887d
Merge branch 'develop' of github.com:BitShares/qt_wallet into develop

Conflicts:
	MainWindow.cpp