cambios
Merge branch 'Develop' of https://github.com/hugomarin/artBO into Develop

Conflicts:
	view/home.php
	view/login-recuperar-contrasena-0110.php
	view/login-recuperar-contrasena-0120.php
	view/login-recuperar-contrasena-0130.php
	view/login-recuperar-contrasena-0140.php
	view/login.php