Synching with upstream
Merge branch 'master' of git://github.com/JeanHuit/testcit
Overwriting fontawesomeicon height
Revert "Overwriting fontawesomeicon height"

This reverts commit 84018b1e5c4638904396f85a15f911e4c28762e8.
Overwriting fontawesome icon height

Making icon on same height with elements in the main stylesheet
Merge pull request #7 from jeffgodwyll/master

Overwriting icon line-height