fix description text
Merge branch 'bitshares' of https://github.com/BitShares/web_wallet into bitshares
merged with develop branch; btsx->bts transition is complete
More btsx -> bts renaming
Merge branch 'develop' into bitshares
Merge branch 'develop' into bitshares
Merge branch 'develop' into bitshares
removed Test Network from footer
Merge branch 'bitshares' of github.com:BitShares/web_wallet into bitshares
Merge branch 'develop' into bitshares
Merge branch 'develop' into bitshares

Conflicts:
	app/img/background.jpg
	app/img/background@2x.jpg
	app/img/bts-background.jpg
	app/img/bts-background@2x.jpg
	app/img/bts-ico-blue.svg
	app/img/bts-ico-w.svg
	app/img/bts-logo-blue.svg
	app/img/bts-logo-ico.svg
	app/img/bts-logo-w.svg
	app/img/btsx-background.jpg
	app/img/btsx-background@2x.jpg
	app/img/btsx-ico-blue.svg
	app/img/btsx-ico-w.svg
	app/img/btsx-logo-blue.svg
	app/img/btsx-logo-w.svg
	app/img/ico-blue.svg
	app/img/ico-w.svg
	app/img/logo-blue.svg
	app/img/logo-w.svg
More BTSX(T) -> BTS renaming
Merge branch 'develop' into bitshares
Revert "more renaming"

This reverts commit 3299eb41d6e2c02c192c1a5c772982cb2b39deb0.
Revert "More BTSX(T) -> BTS renaming"

This reverts commit 23c02cd8f7261d56dd072d60cf61329c029c2a7a.
Merge branch 'develop' into bitshares

Conflicts:
	app/img/background.jpg
	app/img/background@2x.jpg
	app/img/bts-background.jpg
	app/img/bts-background@2x.jpg
	app/img/bts-ico-blue.svg
	app/img/bts-ico-w.svg
	app/img/bts-logo-blue.svg
	app/img/bts-logo-w.svg
	app/img/btsx-background.jpg
	app/img/btsx-background@2x.jpg
	app/img/btsx-ico-blue.svg
	app/img/btsx-ico-w.svg
	app/img/btsx-logo-blue.svg
	app/img/btsx-logo-w.svg
	app/img/ico-blue.svg
	app/img/ico-w.svg
	app/img/logo-blue.svg
	app/img/logo-w.svg
Merge branch 'develop' into bitshares
Merge branch 'develop' into bitshares
Merge branch 'develop' into bitshares
Merge branch 'develop' into bitshares