Disable questionable rescanning on upgrade
Add downstream fixes
Fix genesis json
More downstream syncing
Merge branch 'develop' into btsx

Conflicts:
	BUILD_UBUNTU.md
	libraries/blockchain/balance_operations.cpp
	libraries/blockchain/market_engine.cpp
	programs/qt_wallet
	programs/web_wallet
Bump chain db version
Merge branch 'develop' into btsx
Fix build
Merge pull request #37 from vikramrajkumar/btsx

sync upstream