Merge commit
Merge branch 'master' of https://github.com/mapto/sprks
Updated templates