Merge branch 'develop'
carga js barra
Merge branch 'develop'

Conflicts:
	header.php
Merge branch 'develop'
wp_reset_query
testing
...
enlaces header
Merge branch 'develop'
Merge branch 'master' into develop