No longer a working title
Collection model and REST endpoints
Merge branch 'collections' into hierarchy-widget

* collections:
  Collection model and REST endpoints
  No longer a working title

Conflicts:
	girder/api/api_main.py
	girder/api/rest.py
	girder/api/v1/folder.py