- Fixed common issues

Signed-off-by: wmthiet90 <nvthiet.khtn08@gmail.com>
Merge branch 'linhchinonglam' of github.com:quangthi90/Templates into linhchinonglam