Adding Export to China and Huijinkou to list of websites using ember and added logos
Removed Huijinkou per pull request
Adding Export to China and Huijinkou to list of websites using ember and added logos
Removed Huijinkou per pull request
Merge branch 'master' of https://github.com/abobwhite/emberjs-website

Conflicts:
	data/users.yml
Merge pull request #1725 from alvinvogelzang/master

Add closealert.com to Ember users
Revert "Add closealert.com to Ember users"
Merge pull request #1727 from emberjs/revert-1725-master

Revert "Add closealert.com to Ember users"
Merge pull request #1726 from abobwhite/master

Add ExportToChina.com to Ember Users list
Fix spelling error in router guide

mutliple -> multiple
Merge pull request #1730 from nikolas/patch-1

Fix spelling error in router guide
Update fixture data for 1.8.0-beta.4.
Rebase ember users