fixed users javascripts
Merge branch 'markers'
merging markers to master