Move coding guidelines to GitHub wiki
Remove merge warning
Add wallet_account_balance_extended
many fixes to object records
update submodule
Merge branch 'develop' of https://github.com/BitShares/bitshares into develop
new testnet
Merge branch 'develop' of https://github.com/BitShares/bitshares into develop
testnet genesis
Rewrote algorithm for deciding what fork is the valid chain when we get a new block. Also added support for allowing blocks from the future to be checked again for validness when we restart. TODO: allow for these blocks to be revalidated without restarting while client is running if we detect a clock change.
progress on auctions, sites, and object ownership
Merge branch 'develop' of https://github.com/BitShares/bitshares into develop
Update web_wallet submodule
Merge branch 'develop' into bitshares

Conflicts:
	libraries/blockchain/object_operations.cpp
	programs/web_wallet
Update web_wallet submodule
Update checkpoint