added token authentication logic for phonegap login
updating master
Merge branch 'build-103013'