5th
Merge branch 'dev'

Conflicts:
	a.txt
Update b.txt
modified b.txt on local
Update b.txt
local need to push
Merge pull request #1 from xcjiang/master

pull from master to dev