Admin and minor changes

Todo lo de admin y bd
Merge remote-tracking branch 'origin/master'

Conflicts:
	header.php