changes pages and post
Merge branch 'develop' of https://github.com/josegargon/IHorseWeb
Merge branch 'master' of https://github.com/josegargon/IHorseWeb
Merge branch 'master' of https://github.com/josegargon/IHorseWeb
[Sprint 52] conflicts
[Sprint 52] conflicts
Merge branch 'master' of https://github.com/josegargon/IHorseWeb
Merge branch 'master' of https://github.com/josegargon/IHorseWeb
Merge branch 'master' of https://github.com/josegargon/IHorseWeb
[Sprint 53] conflicts process-form
Merge branch 'master' of https://github.com/josegargon/IHorseWeb
Merge branch 'master' of https://github.com/josegargon/IHorseWeb
Merge branch 'master' of https://github.com/josegargon/IHorseWeb
Merge branch 'master' of https://github.com/josegargon/IHorseWeb
Merge branch 'master' of https://github.com/josegargon/IHorseWeb
Merge branch 'master' of https://github.com/josegargon/IHorseWeb
[Sprint 60] Modified files on server
Merge branch 'master' of https://github.com/josegargon/IHorseWeb

Conflicts:
	wp-config.php
	wp-content/themes/ihorse/process-form.php