Updated for soft delete
Merge branch 'master' of https://github.com/renns/bennu

Conflicts:
	src/main/scala/com/qoid/bennu/webservices/DeleteService.scala
	src/main/scala/com/qoid/bennu/webservices/UpsertService.scala