initial testing revision
Merge branch 'master' of github.com:jrief/generator-djangocms