Merge remote-tracking branch 'origin/master' into develop
Restore license agreement for dacsun repo
update GUI version
Merge pull request #9 from nmushegian/nikolai

gui update 0.4.14
Merge branch 'develop' of https://github.com/BitShares/web_wallet into nikolai
Merge pull request #10 from nmushegian/nikolai

0.4.14a
Merge pull request #11 from vikramrajkumar/develop

merge latest
Merge remote-tracking branch 'upstream/develop'
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
Merge branch 'develop' into btsx
Merge pull request #15 from vikramrajkumar/btsx

merge upstream
Rename avg_price_1h -> center_price
Merge pull request #16 from vikramrajkumar/btsx

Rename avg_price_1h -> center_price
Revert "Rename avg_price_1h -> center_price"

This reverts commit 267a6a8306f9b1741c52f1b5f2c03a9cbb4e2e4a.
Merge branch 'develop' into btsx
Merge branch 'develop' into btsx

Conflicts:
	app/js/controllers/unlockwallet.coffee
Merge pull request #17 from vikramrajkumar/btsx

Merge upstream
Merge branch 'develop' into btsx