Updated branch with Latest Master

ATTENTION: FILTER RANGE SLIDER IS NOT IN THE CURRENT VERSION!