add templates, add more controller support
Merge branch 'master' of github.com:cloudspace/play_framework_tutorial