Initial commit
Merge branch 'master' of github.com:iixi/easy-template-framework