5555
Merge branch 'master' of github.com:chinawhere/chinawhere

Conflicts:
	app/controllers/articles_controller.rb