some fixes
Merge branch 'master' of https://github.com/juanjdlt/medicentro_web

Conflicts:
	index.php