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

Conflicts:
	Frontend/web/css/noticias.css
	Frontend/web/css/noticias.styl
	Frontend/web/noticias.html