update
Merge branch 'develop' of https://github.com/fabianrios/arteccb into develop

Conflicts:
	stylesheets/new.css
	view/registro- documentos-0450.php