Changes for FI Advice system task
Fixed failing spec
Merge branch 'master' of https://github.com/StrataLabs/service_desk