Fix CAP imports.
Merge pull request #769 from FrancescoMino/master

EVR module and shelter modifications, reviewed
Cleanup EVASS merge