added template stuff improve
Merge branch 'datalife_template' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-datalife_template
Merge branch 'jvazquez-r7-datalife_template'