Fix filemap tests
Merge branch 'master' into amdy
defineView source parser
Add define and defineHelper parsing support