Merge branch 'master' into database
Merge branch 'master' of http://github.com/sacowe/actores into database
cambios menores controller.py
?