Added changes from AdaptLearning develop branch and moved findByID from adaptModel.js to adapt.js