ultimos cambios dashboard new
Merge branch 'develop' of https://github.com/fabianrios/arteccb into develop

Conflicts:
	view/home.php
	view/register.php
Merge branch 'develop' of https://github.com/fabianrios/arteccb into develop

Conflicts:
	view/datos-artista-0300.php
quitar .conflict
Merge branch 'develop' of https://github.com/fabianrios/arteccb into develop
calendar
de nuevo hv
Merge branch 'develop' of https://github.com/fabianrios/arteccb into develop
all
todo