merge
Merge branch 'master' of https://github.com/mseskas/robotics

Conflicts:
	c++ and linux/main v0.1/bin/Debug/c++ thread
	c++ and linux/main v0.1/c++ thread.layout
	c++ and linux/main v0.1/obj/Debug/main.o
	c++ and linux/main v0.1/obj/Debug/src/activities/activities.o
	c++ and linux/main v0.1/obj/Debug/src/video processing/advanced_opencv.o
	c++ and linux/main v0.1/src/activities/activities.cpp