Make bootstrap and fa more compatible
Merge pull request #1848 from martndemus/fa-bs-backward-compat

Make bootstrap and fa more compatible