Merge pull request #715 from isuftin/master

Fixed a weird merge conflict and fixed event handling for click
Merge pull request #716 from isuftin/master

UI updates
Merge pull request #717 from isuftin/master

Creating a secondary geoserver for use with the portal. This requires a bunch of rewrites in the handling code
Merge pull request #718 from isuftin/master

Fixed a sugar.js issue that breaks firefox
Merge pull request #719 from isuftin/master

[Bug] click to ID on shorelines. Occurs when there's only one row in leg...
Fixing a ribboning issue for back of card