some none ARC compatible code was left in the debug part
added an addAcccount method
added some helper methods when we have a token but not client
v1.2.5
Merge remote-tracking branch 'origin1/master'