Merge pull request #18 from yuanwowo/master

Update distribution.md and marketplace.md
Revert "Update distribution.md and marketplace.md"
Merge pull request #19 from MozillaChina/revert-18-master

Revert "Update distribution.md and marketplace.md"
Merge branch 'master' of github.com:yuanwowo/firefoxos-quick-guide into yuanwowo-master

Conflicts:
	distribution.md
	marketplace.md
Merge branch 'yuanwowo-master'
Update back.md