some update
some update
Merge branch 'master' of https://github.com/caprice/template.git