Melanie |#0000| Fixing Ft and adding jasmine tests
Merge branch '16_0_release' into develop