fix version to match client
fix version (this is not btsx)
show blockchain margin orders
revert GUI to be test net instead of BTSX
Merge branch 'develop' into btsx

Conflicts:
	app/js/controllers/unlockwallet.coffee
Revert "revert GUI to be test net instead of BTSX"

This reverts commit 26974dad0af3af032d988f5df189d75bd9538af0.
Merge pull request #14 from vikramrajkumar/btsx

merge latest