build jenkins
Merge remote-tracking branch 'github/master'

Conflicts:
	hooks/post_gen_project.py
change django-debug-toolbar init