log errors
Merge remote branch 'upstream/master'

Conflicts:
	tests/testlocalizer.cpp
robapp added to CMakeLists.txt
minor changes, planner test added
control trajectory, Julian's code
Merge pull request #11 from pdelapuente/master

minor changes, planner test added