merge upstream
Merge branch 'deploy' into develop
merge with version 1.0
use cross domain token to authenticate subscription
add cross domain login to subscription controller