Se eliminan inconsistencias, y se refuerza integridad referencial
Merge branch 'master' of https://github.com/smaass/sar2014
Merge branch 'master' of https://github.com/smaass/sar2014