resolvido conflito jQuery
Merge branch 'bootstrap-1.0' of https://github.com/diegonobre/ieducar into bootstrap-1.0