update demo
update guide
Merge branch 'master' of https://github.com/nikogu/tmpl
Merge pull request #2 from kissygalleryteam/master

Merge pull request #2 from nikogu/master