Merge branch 'master' of http://101.36.160.140:21044/depot-neimeng/depot-eureka-neimeng

# Conflicts:
#	.gitignore
#	README.md