[Merge] removed the conflicts with master branch

docker-compose/core-network.sh

docker-compose/docker-compose-gnbsim.yaml

docker-compose/docker-compose.yaml

docker-compose/oai_db.sql

docs/BUILD_IMAGES.md

docs/DEPLOY_HOME.md

docs/DEPLOY_SA5G_WITH_GNBSIM.md

docs/images/5gCN_gnbsim.jpg

docs/images/virtual-machine/cots-ue/bupt/MYSQL.png

...es/virtual-machine/cots-ue/bupt/amf_MCC_MNC_TAC_Slice.png

docs/images/virtual-machine/cots-ue/bupt/amf_algorithm.png

docs/images/virtual-machine/cots-ue/bupt/amf_interface.png

...mages/virtual-machine/cots-ue/bupt/network_Ip_Address.png

.../virtual-machine/cots-ue/bupt/session_management_list.png

docs/images/virtual-machine/cots-ue/bupt/smf_dnn_list.png

docs/images/virtual-machine/cots-ue/bupt/smf_inteface.png

docs/images/virtual-machine/cots-ue/bupt/spgwu_Ip_list.png

docs/images/virtual-machine/cots-ue/bupt/spgwu_s4.png

docs/images/virtual-machine/cots-ue/bupt/spgwu_sgi.png

docs/images/virtual-machine/cots-ue/bupt/spgwu_slice.png