Merge branch 'master' into ptics_time_fixes
Merge branch 'master' into ptics_time_fixes
References to external files in session log more general.
Merging NLG ontology into DM ontology
"Po poledni" -> "odpoledne", "Před polednem" -> "dopoledne"
Making TemplateNLG language-independent again

Moving language/domain-specific functionality into pre- and
postprocessing classes.
Bugfix: time > 12hr always interpreted as 24hr.
Merge branch 'master' into ptics_time_fixes
Using a more generic function in SLU number normalization.
Merge branch 'master' into ptics_time_fixes
I prefer to use unicode for all.
I prefer to use unicode for all.
Adding missing templates for date_rel
Merge branch 'master' into hdc_policy_refactoring

Conflicts:
	alex/components/dm/ontology.py