added marvel template parsing
Merge branch 'master' of https://github.com/test0101/sandbox