ok
Merge branch 'master' of https://github.com/carlosolmos/electrumalfa

Conflicts:
	application/third_party/credentials.google
Merge branch 'master' of https://github.com/carlosolmos/electrumalfa

Conflicts:
	application/third_party/credentials.google
Merge branch 'master' of https://github.com/carlosolmos/electrumalfa
Merge branch 'master' of https://github.com/carlosolmos/electrumalfa
i
Merge branch 'master' of https://github.com/carlosolmos/electrumalfa
Merge branch 'master' of https://github.com/carlosolmos/electrumalfa