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)
Merge branch 'master' into nlg_subset_search

Conflicts:
	alex/applications/PublicTransportInfoCS/nlg_templates.cfg
Merge branch 'master' into nlg_subset_search
Merge branch 'master' into nlg_subset_search
Merge branch 'master' into nlg_subset_search
Merge branch 'master' into nlg_subset_search
Merge branch 'master' into nlg_subset_search
Fix in enumerating DA nblist.