Merge branch 'master' into davidsBranch
HUD Updates
Merge branch 'davidsBranch'