Merge branch 'master' of https://osm.etsi.org/gerrit/osm/UI

Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>