(BY:eda) updates again S feature
(BY: mark) New feature S finished
(BY: mark) new A feature finishes
(BY:eda) Merge conflit resolved
Merege conflict resolved