Merged activity with learning activity

addresses https://github.com/adlnet/xAPI-Spec/issues/77