added hours to VCTM conferences
modified resume content
Merge branch 'dev-v3.2.1' into develop