standardized form naming
standardized form naming
Merge branch 'master' of github.com:Diagnospedia/diag-ui

Merging.