udpate apache+nginx_configuration_guide
Merge branch 'master' of https://github.com/hust/pingjia_repo_dev.git
Merge branch 'master' of https://github.com/hust/pingjia_repo_dev.git
update by liao