16-12-2013
Merge pull request #3 from archnoth/11-12-2013

11 12 2013
notas de ventas
Merge branch 'master' of http://github.com/archnoth/android

merge 17-12-13
merge antonio-master 1
antonio-juan-master merge