Buildfile and doxyfile
Buildfile fix
More buildfile fixes
Merge pull request #117 from daniel-dgi/7.x

7.x