update readme
fix composer bug
add maki marker plugin
update readme
added missing assets
fix composer bug
fix again the jsonUrl bug (dough!)
update docs and minor bug
add missing copyright information
Update PluginManager.php

This fixes #1 first question... now, the problem seems to be the marker, that you place...
Update Marker.php

Removed the type icon to pass over, as this doesn't seem to work with you makimarkers plugin
Merge pull request #2 from philippfrenzel/patch-2

Update Marker.php
Merge pull request #1 from philippfrenzel/patch-1

Update PluginManager.php
remove files from 'master' before merge
Merge stripped branch 'master'

* commit '5daffd2719489ba1e6d5b8698bb809fcfab914df':
  remove files from 'master' before merge
  Update Marker.php
  Update PluginManager.php
  add missing copyright information
  update docs and minor bug
  fix again the jsonUrl bug (dough!)
  fix composer bug
  added missing assets
  update readme
  add maki marker plugin
  fix composer bug
  update readme