Merge changes from topic "ActivationType" into qt-dev

* changes:
  Add ActivationType to EventActivation
  Save EventActivations to disk