listo
listo
Merge branch 'master' of https://github.com/jggomez/sevenminds

Conflicts:
	Frontend/web/js/noticias.js
listo