merge to bootstrap v3.0 and font awesome v4.0