base our api RestServlet on the 4.0.3 datanucleus one now. note: provisionary update, as pom.xml does not reflect this change yet - this is only for jason to merge with whaleshark.org first to test, then pom in mantamatcher can be updated too
LOCAL: user agreement update
bug in sortValueAt()
Merge branch 'mantamatcher.org' of github.com:holmbergius/Wildbook into mantamatcher.org
fix bug when less than full page of results to show
now use compression for api json rest output doGet()
div wrapper in td on table so that we can maintain height
fix [WG-8]
new wildbook.parseDate(string) in order to address [WG-1]
fix for [WG-4] inconsistent sort when initialized
fix initial sort (and related problems) on encounters table [WG-2]
Merging CSS changes and Encounter Search results reformatting
LOCAL: removing duplicate files to smooth merge to whaleshark.org for testing
base our api RestServlet on the 4.0.3 datanucleus one now. note: provisionary update, as pom.xml does not reflect this change yet - this is only for jason to merge with whaleshark.org first to test, then pom in mantamatcher can be updated too
Encounter Search merge fix from whaleshark.org CSS changes
Merge remote-tracking branch 'origin/mantamatcher.org' into whaleshark.org

Conflicts:
	src/main/webapp/encounters/mappedSearchResultsSex.jsp
	src/main/webapp/encounters/searchResults.jsp
	src/main/webapp/encounters/thumbnailSearchResults.jsp
	src/main/webapp/userAgreement.jsp