Minor fixes to make thub work
Refactoring: matching generic templates in a separate method.
Allowing to compose longer sub-templates (greedy algorithm)
Fixing rights
Merge branch 'master' into nlg_subset_search

Conflicts:
	alex/applications/PublicTransportInfoCS/data/database.py
Adding a few comments
Bugfix
Fixed indentation (thanks David)
Typo (thanks David)
Preventing of possible infinite loop at VIO.
ASR Voip DATA dirs
Merge branch 'master' into nlg_subset_search

Conflicts:
	alex/applications/PublicTransportInfoCS/nlg_templates.cfg
Now the seesion name does not include callers phone number.
Fix in transcriber WAV extraction.
Working HTK ASR scripts.
Merge branch 'master' of github.com:UFAL-DSG/alex
Inflecting cities' names
Merge branch 'ptics_live'
Added missing train and test scripts.
Merge branch 'master' of github.com:UFAL-DSG/alex