updated marker with label js library
Merge remote-tracking branch 'upstream/master'