refs
Merge branch 'master' of github.com:haobtc/richwallet

Conflicts:
	public/manifest.appcache
UI tweak and translate