ch3:更改代码块的markdown写法
ch5:更改代码块的markdown写法
Merge branch 'master' of https://github.com/basestyle/angularjs-cn; branch 'master' of https://github.com/coderhaoxin/angularjs-cn into coderhaoxin-master

Conflicts:
	Chapter5.markdown