Merge branch 'feature/api' into develop

Conflicts:
	application/parser/parser.py, resolved using THEIRS
Parser fixed, the application now compiles

Deleted the case on the handler of a request containing both a geojson and a geocoding, since that will never happen
Merge branch 'develop' into consolidate_feature_branches