commit for pull
Merge branch 'master' of https://github.com/omagpiong/QualitySoft_T7
code cleanup and fixed compiler issues