fix to expiration date display in open margin orders
keep Chinese translation updated
Merge pull request #437 from AlexChien/chinese

keep Chinese translation updated
Merge branch 'develop' into bitshares
More BTSX(T) -> BTS renaming
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
more renaming
Merge branch 'develop' into bitshares