Merge branch 'master' into feature/fontawesome
adding font awesome, removing old fontawesome.
Readme update
update MANIFEST.
Bump versions.
Conclict.