Initial commit
fixing merge conflicts
added click apply filter to on/off markers