init
update
Merge branch 'master', remote-tracking branch 'oschina/master'

Conflicts: