Export all core modules properly
Merge branch 'master' into development
Improve the templating engine
Pass proper context when triggering event
Merge branch 'master' into development