Deleted references to deleted item (see issue #1)
Deleted font-awesome package
Minor layout change on users page
Merging conflict resolution