mv django17
Merge branch 'master' of github.com:simodalla/mezzanine_folder_page

Conflicts:
	setup.py
fix!