Adds templates
Merge pull request #1 from carlos-codecery/templates

Templates
Adds Parse Features
Merge pull request #2 from carlos-codecery/templates

Adds Parse Features