cambios para el merge 17-12
Merge branch 'master' of http://github.com/archnoth/android

merge
18-12-2013