Merge branch 'rodel'
Merge branch 'rodel'
Merge branch 'hanzel'
Merge branch 'master' of github.com:rodel1992/qms