updated gitignore
Updated strings
Merge branch 'master' of https://github.com/claucookie/recarga-tussam-android
Updated gitignore