modified templates
Merge branch 'master' of sharetask.github.com:sharetask/sharetask