Merge pull request #2 from jpcardona/Ricardo

Ricardo
Merge pull request #4 from jpcardona/Pablo

Pablo
Merge pull request #7 from jpcardona/Pablo2

Merge pull request #6 from jpcardona/Pablo3
Merge pull request #8 from jpcardona/Pablo4

Pablo4
Merge pull request #9 from jpcardona/Pablo3

Pablo3
revision 21/08/2013
Merge pull request #10 from jpcardona/ricardo2

revision 21/08/2013
revision 22/08/2013
modfffff
manu admin
Merge pull request #14 from jpcardona/ricardo3

revision 22/08/2013
modificaciones rockstar
Merge pull request #15 from jpcardona/Pablo5

Pablo5
correos
correos
correos
mmmmmoddddd
revision 22/08/2013 -mañana
mmmmmoddddd22222
mmmmmoddddd22222