Merge pull request #2 from dracoo/sonatauser

tnx
Merge branch 'sonatauser' of github.com:net02/sf-templates into sonatauser