Docuementos y Espacio
Merge branch 'Develop' of https://github.com/hugomarin/artBO into Develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
new.css
Merge branch 'Develop' of https://github.com/hugomarin/artBO into Develop

Conflicts:
	view/registro-ferias-0430.php