Add menu
Merge branch 'integration' into devel
merge error (kept get_subscription_from_token)