hice un cambio fundamental
Merge branch 'master' of https://github.com/fulbito/fbtweb.git

Conflicts:
	fbtweb/index.php
Merge branch 'master' of https://github.com/fulbito/fbtweb.git

Conflicts:
	fbtweb/index.php