added short_name field to site add/edit forms
Merge branch 'release/orbis-r1' into release/orbis-r2