made a few changes
Merge branch 'master' of https://github.com/geraldfletcher/dsa_webelevate_3.0_mwa