WATERSMART-347
* Using development JNDI property to determine whether to load development resources
* clientRoot js resources set
* USGSHead js and css as well
WATERSMART-347
* Also switched analytics dev flag to use JNDI rather than request parameter
WATERSMART-347
* Cleaning up how versions and dev flags are passed around
WATERSMART-347
* And can remove filtering directly to jsps
Merge branch 'master' of github.com:USGS-CIDA/nwc into WATERSMART-247

Conflicts:
	src/main/webapp/WEB-INF/tiles/common/USGSHead.jsp
Merge pull request #122 from jiwalker-usgs/WATERSMART-247

Watersmart 247