Markers: Better recovery from stopped state.
Merge branch 'master' of github.com:margaridaCF/triton
ImcJava: Updating changes in IMC Java that enable multicast and broadcast for discovery thread.
ImcSystem: Correcting calculation of height.
Markers: Making the destruction of the activity thread safe.