Merge branch 'master' into catalogImages
updated training page
Merge branch 'master' into catalogimages
Merge branch 'master' into catalogImages
changed wms url layout on services page.
adjusted entry on wms layout page for small screens
Added svg logo and texas, updated wms, data catalog pages, added arcgis help modal to wms page
Merge branch 'catalogImages'

Conflicts:
	content/markdown/news/2014-12-20-welcome-to-the-brand-new-tnris.md