Merge branch 'master' into stoewer-dev
Makefile: solved some minor issues with lib dir and target name for tests
Doxyfile
Merge branch 'stoewer-dev'