modificaciones 20140423
Merge branch 'master' of https://github.com/GDGOpenLima/flisol-lima-este