Add supporting for user's defined public key
Merge branch 'master' of github.com:long-nguyen/Facebook-Conceal-Eclipse-Test-