Remove deprecated ifdef'ing
Merge branch 'master' of github.com:BitShares/qt_wallet