use "凌晨" for hour < 6
use "点整" for this.minutes() === 0
use "本周" for current week
set Monday as the first day of the week
Fixed wrong Chinese meridiem time, based on pull request #1056
update to pass test
settings for ISO 8601 Weeks & update test/lang/zh-cn.js
makr jshint happy
Merge pull request #1 from moment/develop

rebase
Fixes component.json generator
Fix list in component config.scripts
Added changelog in readme for 2.3.1
repairing language tests
Merge pull request #1177 from icambron/language-test-module-check

repairing language tests
Merge pull request #1172 from wejendorp/develop

Fixes component.json generator
Removed scripts reset in tasks/component.js
Merge branch 'develop' of github.com:zenozeng/moment into zenozeng-develop

Conflicts:
	lang/zh-cn.js
Removed a failing iso-format parsing test

One of the things that is broken on Android is "including a trailing UTC in the
input should work", which is a test added a long time ago, that used the fact
that ISO format matched beginning of string.

So right now this test goes through Date, which is different on regular vs
mobile browser. Also adding UTC at the end doesn't make it parse a UTC date, so
its misleading to say the least.

I think removing the test makes the most sense in this case. The behavior (of
adding UTC at the end is not documented, so shouldn't break legitimate code).
Merge pull request #1183 from ichernev/bugfix/utc-at-end-of-iso-format

Removed a failing iso-format parsing test
Another breaking test because of stricter iso parser

This time there is am added at the end, which was never parsed as part of iso
format, so if it was pm it would result in a wrong parse.

Deleting this test. Docs don't say this is possible, right :)
Merge pull request #1185 from ichernev/bugfix/do-not-handle-ampm-end-of-iso

Another breaking test because of stricter iso parser