Fixed regression in ResourceLocatorAdapter
AI-579 Moved CuidAdapter to models module

The migrator tool will need to access the CuidAdapter
to move data from the db to the generic resource store.
Merge branch 'version4' of github.com:bedatadriven/activityinfo into version4
Merge branch 'version4' of github.com:bedatadriven/activityinfo into version4