Merge branch 'master' into case_multimedia

Conflicts:
	casexml/apps/case/xml/generator.py
	casexml/apps/case/xml/parser.py
better logging of doc update conflicts in case processing and one fix

Case:61447
Merge pull request #68 from dimagi/update-conflicts

better logging of doc update conflicts in case processing and one fix
Add param for attachment to url
Merge pull request #47 from dimagi/case_file_name_error

Add param for attachment to url
removing printouts
removing import
include location uuids in case json export
Merge branch 'master' into droos
Merge pull request #69 from dimagi/droos

add location to case json export
cleanup unused, merge artifacts, etc
url reference and explanation, cleanup of rendering of display
removing empty that's never called for attachments
test cleanup, restoring signal call, whoopsies
updating imports
case "subcase" wrapping in cloucdcare API (NOT EXHAUSTIVE)
Merge pull request #70 from dimagi/droos

return cases wrapped as correct document subclass in cloudcare api
fixing generator
Add a couple of missing deps; possibly not true casexml deps (TODO: figure that out)
Set up quieter test logging