Branded and added the z-index back onto the panel (oops)
added user marker
Merge remote-tracking branch 'origin/dev.gab' into dev.tim.chandler
Merge remote-tracking branch 'origin/dev.dms' into dev.tim.chandler