Placed Dani's modules on develop branch
Merge branch 'develop' of https://github.com/libbyshoop/csinparallel into develop
Merge branch 'develop' into d/leesn
Moved RiverTrail and IntelPhi to the dev/ directory