Added composed action edit/new activity.
Merge branch 'master' of https://github.com/Ostis/Ostis.git
Merge branch 'master' of https://github.com/Ostis/Ostis.git