Merge pull request #565 from farismosman/master

[#1875] Machaba/Faris | Added ability.
[#1875] Sanchari/Faris | Refactoring API functional test.
[#1875] Sanchari/Faris | Added enquiries feature.