Added templates, separated API call to separate model
Merge remote-tracking branch 'origin/master'