Merge pull request #67 from aeantipov/master

CMakeLists for samples
Changed main Makefile to recreate this_dir.mk every time in case folder is moved.
CMakeLists update - correct inclusion and installation of headers