cosas drag and drop no terminadas
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/post_contenido.php