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.