Merge branch 'develop' of https://github.com/adaptlearning/adapt_framework into feature/8814

* 'develop' of https://github.com/adaptlearning/adapt_framework:
  Updated device.js &  support for plugins .less

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.