Add some architecture for custom marker icons

For whatever reason, mapclass.js isn't behaving as it should.
Merge branch 'development' into f.nodemarkers
Fix up markers and conform to style