Test commit no7~
Merge branch 'fresh_mistjs' of https://github.com/mistio/mist.io into fresh_mistjs