pulled crazy compound primary key stuff out, in favor of using computed primary key (due to fact i could not figure out how to make 2-key method indifferent to ordering of keys)
removed commented-out stuff related to compound key (see previous commit)
Collaborations data table
retooling of some of the main testing methods
servlet & texts for manipulating Collaborations
whirly throbber
js for collaborations
new class that spits out just javascript, with some globally desirable (for javascript world) values
really ugly checkerboard background for silo security blocking
adding google gson json-parsing library
major commit with most of security/"silo" changes.   in addition to general tweaking of existing code, some new stuff added:
* Collaboration class now pretty solid
* /Collaborate servlet handles most of silo collaboration json requests (ostensably non-json as well - untested)
* new human-strings in .properties files
* lots of client-side stuff (including "notification" - which someday should live on its own) in collaboration.js
* usage of jquery.blockUI.js to "hide" blocked pages
* some mediocre lock icons to show states of hidden items

this is just an INTERIM implementation of silo work -- next up (after some testing) will be implementing it in all the places it needs to
lock down.  right now it only covers individual encounter.jsp pages and encounters/searchResults.jsp, as test-beds.
nudge notifications up near languages
show collaborations on myAccount page
collaboration list on myAccount page: tweaks to approve/deny directly from list
add language props to javascrpt magic
initial stab at collab/silo work on Occurrences and MarkedIndividuals; related css/js/properties; includes multiple-encounter collab js
bug fix
starting to move popup content creation into js (to consolidate into one place)
more moving of popup into js
silo on thumbnail search