initial font-awesome import
integrate icons into the rest of the ui
re-roxygenize
Merge remote-tracking branch 'origin/master' into feature/font-awesome
update NEWS
Merge pull request #334 from rstudio/feature/font-awesome

icon function for embedding icons from the font-awesome icon library
merge from master

Merge remote-tracking branch 'origin/master' into feature/bootstrap-layout

Conflicts:
	NEWS
	R/bootstrap.R