Merge pull request #1 from chrissbarnett/master

solr4 support, small fixes
Merge pull request #1 from TuftsOGP/master

merging changes from TuftsOGP
Adds a public track method to the Analytics class.
Adds tracking for metadata events.
Adds tracking for login events.
Adds tracking for changing results sort order event.
Adds tracking for changing the results columns displayed event.
Adds tracking for navigating search results.
Adds tracking for help events.
Adds tracking for various interface events.
Adds tracking for find place geocode event.
Adds tracking for limiting results to visible map area event.
Adds tracking to various layer events including adding and removing from cart, viewing attributes, previewing and downloading.
Adds tracking for basic and advanced search events.
Removing old references to _gaq.
Merge pull request #2 from gravesm/analytics

Analytics
Merge pull request #2 from chrissbarnett/master

login changes,etc.
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	geoportal_1/src/main/webapp/resources/javascript/userInterface.js
Update geoportal_1/src/main/webapp/resources/ogpConfig.json

changed default solr back to geodata.tufts.edu, removed tufts google api key and google analytics id.
removed some extraneous methods from FilterServletOutputStream.java.