Inicial
Ajuste de opciones
Merge origin/master

Conflicts:
	contact-options.php
	jp-theme-tools.php