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