Fixed a bug preventing tokens to be added
Updated gradle settings to suppor the latest version of android studio