hydroshare/hs_core — pull request #1 by JeffHeard (2014-04-16 14:19:51+00:00)
Title: Merge the HSAPI branch with the master branch

Include the new Hydroshare API as well as a bunch of changes to the GenericResource model to support most normal resources.