Temporary[Dirty] fix for WAUTH-2

Fall back to Nokia S40 for fixing end to end encryption
Merge pull request #12 from thiagupct/patch-8

Temporary[Dirty] fix for WAUTH-2
Resolved merge conflict