Merge pull request #36 from crlyli/development

Updating templates models and api
Merge pull request #4 from wc351/development

Merge pull request #36 from crlyli/development