[zh_CN] done /zh/controllers/pages-controller.rst
[zh_CN] replace tabs with spaces
Merge pull request #1841 from blackpuppy/zh

[zh_CN] done /zh/controllers/pages-controller.rst
[fr] fix typos
[en] complimentary -> complementary
[en] complimentary -> complementary
Merge pull request #1852 from blackpuppy/zh

[en] complimentary -> complementary
Merge branch 'master' into zh-work

Conflicts:
	zh/controllers/pages-controller.rst
resolved!
Merge branch 'zh-work' into oschina