-
Merge branch 'master' of github.com:andrezinho/md

Conflicts:
	js/mijs/publicaciones.js