Added template
Fixed failing unit test
Merge branch 'master' of github.com:jrief/djangocms-cascade

Conflicts:
	examples/bootstrap3/test_settings.py
Merge remote-tracking branch 'upstream/master'