cambios 15-1-2013
Merge branch 'master' of github.com:nunataksoftware/ggj-mendoza