Adjustment for font icons in myFR
Fix navigation li size so that the borders don't extend vertically past the bottom of the nav.
Ignoring the submodules until we are ready to deploy them
Conflicts:
	vendor/plugins/acts_as_list
	vendor/plugins/bootstrap-sass
	vendor/plugins/calendar_helper
Update classes to work with new font based document icons

Conflicts:
	vendor/plugins/acts_as_list
	vendor/plugins/bootstrap-sass
	vendor/plugins/calendar_helper
	vendor/plugins/geokit-rails
	vendor/plugins/sitemap_generator
	vendor/plugins/userstamp
Fix path that loads the fr2 specific js (for clippings on article page) from my fr to use an esi so that we get proper asset paths and cache busters.

Conflicts:
	vendor/plugins/acts_as_list
	vendor/plugins/bootstrap-sass
	vendor/plugins/calendar_helper
	vendor/plugins/geokit-rails
	vendor/plugins/sitemap_generator
	vendor/plugins/userstamp