add saml token support
Merge branch 'master' of https://github.com/zhangxu924/android