Merge pull request #38 from schumy21/master

Schumy06/03/2013
Merge pull request #39 from mackk/master

merge
Merge pull request #41 from schumy21/master

Schumy06/03/2013 FINAL
Merge pull request #40 from mackk/master

ControlCitas
Merge pull request #18 from rockamorales/master

merge