Fixed problem Moving markers. Still need to find out a way of moving the anti-zooming highlight circle

Now we compile everything correctly from catkin and from QtCreator. Had to go back to one CMakeLists.txt file, otherwise would not work