Update include dir path
Merge remote-tracking branch 'origin/master' into fix/include_dir_path

Conflicts:
	CMakeLists.txt
Merge pull request #3 from ethz-asl/fix/include_dir_path

Fix/include dir path