Merging Dev into master for latest scenario editor deployment

Added ability for sensor to snap to link, Firefox satellite layer fix, new scenario fix, etc