Merge branch 'master' into navigation_fixes
Merge branch 'ptics_time_fixes' into navigation_fixes

Conflicts:
	alex/applications/PublicTransportInfoCS/hdc_slu.py
	alex/components/dm/ontology.py
Merge branch 'ptics_time_fixes' into navigation_fixes
Merge branch 'ptics_time_fixes' into navigation_fixes
Merge branch 'master' into navigation_fixes
Removed irrelevat not implemented slots.
Renaming some slots in SLU so that the names are consisten with NLG.
Added complete support for requesting departure time, arrival time, relative departure time, rel;ative arrival time, and duration (jurney time).
Added quick fixes to the HDC SLU.
Merge remote-tracking branch 'origin/nlg_fix_date_rel' into navigation_fixes
Added quick fixes to the HDC SLU.
Fix in data preparation for PTIcs SLU.
Merge branch 'master' into hdc_policy_refactoring

Conflicts:
	alex/applications/PublicTransportInfoCS/hdc_policy.py
	alex/applications/PublicTransportInfoCS/hdc_slu.py

Conflicts in hdc_policy.py fixed by hand; need to be checked.