Added ENABLE_MKTG_SITE to Features
Added myself to author file
i18n: Fix typo in studio's email

The right parenthesis should be appeared before the method '.format', not after.
i18n: Fix the chinese name of chinese language

The current version of chinese language's chinese name is not political neutral.
In fact, which form of chinese (traditional or simplified) can be called "正體"(in traditional chinese) or "正体"(in simplified chinese) is not globally defined.
So, I change the name according to the word used by Microsoft Windows, which is more neutral.
Install edx-ora2
Support for displaying submissions API scores in Progress page.
Merge pull request #3051 from louyihua/fix-cms-email-translation

Fix typo in studio's email text
Update translations (autogenerated message)
Concept XBlock prototype
Merge pull request #3037 from edx/will/tim-installation-rebase

Install new ORA (edx-tim)
Merge pull request #3056 from edx/sarina/032514-language-update

Update translations (autogenerated message)
Switch from Rake to Paver
Change `if not args.skip_collect` to `if args.collect`

Simpler and clearer
from __future__ import print_function

and print errors and warnings to sys.stderr
write_stderr() function is unnecessary
Pull Paver requirements out into a separate file
Insert *right* at the front
Changed str->unicode in common/djangoapps/utils/.

LMS-2436
Merge
Merge pull request #3057 from edx/pmitros/concept-xblock-prototype

Concept XBlock prototype

Test environment taking a little longer than expect. Jarv said okay to merge, so merging,
Merge pull request #3032 from IONISx/feature-enable-mktg-site-is-missing

Added ENABLE_MKTG_SITE to Features