Try to obtain the access_token directly in callback page
Merge origin/gh-pages into gh-pages