global and template contexts are now merged
global and template contexts are now merged
Merge pull request #10 from dizlexik/master

global and template contexts are now merged