change many things
Merge branch 'master' of https://github.com/huynt57/ProjectSEM2_BKAP_C1209J