bajar cambios 01-10-2014
Merge branch 'master' of https://github.com/zurdo153/SCOI