URS7,8,19-21
Merge branch 'master' of https://github.com/Putchakarn/SE323-SOFWARE-CONS-TEST-MAINT-