Merge branch 'master' of github.com:jfparadis/requirejs-tpl