Moved folders
Merge branch 'master' of https://github.com/gforge/Greg

Conflicts:
	inst/tests/test-getCrudeAndAdjustedModelData.R