Merge branch 'master' into develop
cmake updated with dat directory
proper paths for modules and dat implemented
Documentation and cmake files updated
Merge branch 'develop'