added lot of stuff
added lot of stuff
Merge branch 'master' of https://github.com/EduardoFF/qarenacontrol

Conflicts:
	src/lcmtest/fakepublisher.cc