Added configuration changes needed for tastypie APIs
Merge branch 'master' of https://github.com/hydroshare/hydroshare2
Merge branch 'master' into api
Moved Api object creation to hs_core/api.py
Merge branch 'api'