Merge branch 'master' of https://github.com/nectia-think/hackaton
no message
Merge branch 'master' of https://github.com/nectia-think/hackaton

Conflicts:
	resources/partials/personas-listado-tmpl.html