Initial commit.
Merge branch 'master' of https://github.com/Wohlfe/djangocms_test

Merging origin/master with local branch.