Local changes are made. Service for adding new activity type is added.
Merge remote-tracking branch 'origin/sstoyanov'