Merge pull request #1 from crashingalexsan/develop

Develop
Codigo de la historia Profile
Merge pull request #2 from danielcarrasco/develop

Codigo de la historia Profile
Merge codigo Daniel
Agregada la compatibilidad con twitter bootstrap
"Added Charly´s Code"
 Fixues issues
Merge pull request #3 from crashingalexsan/merge-bueno

Pasamos a Develop todo el codigo completo