Merge pull request #6 from wikipathways/master

update ap:master with latest work and builds from wp:master
fixed wikipathways/pathvisiojs#80
Merge pull request #81 from AlexanderPico/master

fixed wikipathways/pathvisiojs#80