Merge branch 'master' of github.com:USGS-CIDA/nar_ui

Conflicts:
	nar_common/static/nar_ui/nar.less
iconlarge gone
Merge pull request #130 from mwernimont/master

Summary Changes
Merge branch 'master' of github.com:USGS-CIDA/nar_ui into base

Conflicts:
	nar_common/static/nar_ui/nar.less