upgrade font-awesome to 3.2.1
merge rebuild