Merge branch 'dev'
Merge remote-tracking branch 'origin/master'
fixed get token URL
Merge branch 'dev'
Merge branch 'dev'
Merge remote-tracking branch 'origin/master'
android 2.1 view fixxes, tap variable fix