(BY: mark) New feature S finished
(BY: mark) new A feature finishes
Merge branch 'S-branch' of github.com:veerpartap/cake_php into veer
(BY:veer) updated S feature specification
(BY: mark) New feature S finished
(BY: mark) new A feature finishes
(BY:eda) Merge conflit resolved
Merege conflict resolved