fixed merge error in application.js
fixed a merge error in users#show view, removed font-awesome stylesheet from full-width layout