Merge pull request #104 from trafficland/r1-dev

[r1-dev] MarkerManager, and Clusterer added
Merge pull request #105 from trafficland/r1-dev

fixed broken minified
Merge remote-tracking branch 'upstream/r1-dev' into r1-dev