update
Merge branch 'master' of https://github.com/livestreet/lstemplate-simple