More fixes to language switch
step before adding template directories
Merge pull request #3 from System-Work/Core-templating_engine

Core templating engine Step 1