Combine CRUD operations.
Merge branch 'develop' of https://github.com/icereval/waterbutler into develop

Conflicts:
	waterbutler/server/handlers/upload.py