Revert "SHAREDSOURCE HASTA 28-SEP-2013"

This reverts commit 7540e71eb58eb4ce5880fb2a2f49694a5b6aa646.
Revert "Revert "SHAREDSOURCE HASTA 28-SEP-2013""

This reverts commit f4c745575b3bfe2633c941ce78e12633db6ef11f.
Merge branch 'master' of https://github.com/5tosemestre/SHAREDSOURCE