Añadiendo bootstrap-sass
Fixing hotfix_15423
Merge remote-tracking branch 'origin/devel'