bugfix for markers
now both markers are showing up for different colors
Merge pull request #1 from wikipathways/master

update ap:master with latest work and builds from wp:master