Merged

git-svn-id: http://localhost/svn/core/template/trunk@39 88ec9e9a-694c-41cc-b543-b5cda355a820
git-svn-id: http://localhost/svn/core/template/trunk@40 88ec9e9a-694c-41cc-b543-b5cda355a820
Merge branch 'master' of https://github.com/rjeans/template