Update:
Some bug fixes for some components. Mainly the Robot Simulation
Fixes in the mapping:
	Similar lines may now be combined into one line
	Other fixes relating to the combining of lines