Merge pull request #36 from crlyli/development

Updating templates models and api