new simple version
Merge branches 'master' and 'master' of github.com:dospuntocero/dosCMS3

Conflicts:
	code/BaseConfig.php
	code/ContactPage.php
	code/ExtraImagesAndFiles.php