Fix EmailParser location parsing

This fixes the bug where python dictionaries were being thrown in as item
locations, instead of the actual parsed string.
Merge branch 'unstable' of https://github.com/ARmadillo-reuse/api-server into unstable

Conflicts:
	web_api/processing/EmailParser.py