Change labels for some properties so that they look better on the HTML interface
Merge remote-tracking branch 'origin/master'