integrate Font Awesome 3.2.1 and 4.2.0, misc fixes