Merge branch 'master' of
https://github.com/Eclipse-China/Eclipse-China.github.io.git

Conflicts:
	novemberdays/index.md
commit local changes
Merge remote-tracking branch 'origin/master' into local2
books