minor adoption fixes
more minor adoption fixes
Merge remote-tracking branch 'origin/master'
fixing up jetty plugin config
Merge commit '87ba52b2b26d000b32c9d6f17c6275fb72dc4451'
Merge branch 'master' of github.com:holmbergius/Shepherd-Project
Merge branch '2.1.x'

Conflicts:
	pom.xml
	src/main/java/org/ecocean/CommonConfiguration.java
	src/main/webapp/encounters/encounterAdoptionEmbed.jsp
	src/main/webapp/individualAdoptionEmbed.jsp
fixing cross-browser URL
rest working a bit more
2.2: upgrading derby to 10.8.2.2 to fix a SQL handling issue observed in GeneGIS
reving up version to reflect master's role as a future release
fixing unit tests
persisting classpath changes
adding logback
UPDATED: adding social media
-moving adoption CSS to encounterEmbed.jsp
-applying CSS to measurements
Small amount of localization
removing useless objects and logic deprecated by the new measurements scheme developed in 2.0
fixing measurement table header: sampling protocol was not appearing
fix cascading measurement issue on submission
added another graph on new/resight breakdown