updated conacts
Merge branch '1.0conacts' of https://github.com/ljwolford/ADL_LRS into 1.0conacts
complete after all PRs are in for contextActivities
Merge branch '1.0dev' of https://github.com/adlnet/ADL_LRS into 1.0conacts
Merge branch '1.0dev' of https://github.com/adlnet/ADL_LRS into 1.0conacts
override delete for context and contextActivites
in middle of updating delete