Modificaciones al 20140814
Merge branch 'master' of https://github.com/roldanjm/PortalFinal