added parser and view files
Merge branch 'master' into parser