Actualizado JQUERY a la version 1.11.0
Actualizado BOOTSTRAP a la version 3.1.1
Merge origin/master
Merge origin/master
Merge origin/master
Merge origin/master
Merge origin/master
Merge origin/master
Merge origin/master