commit by testbranch
Merge branch 'testbranch'

Conflicts:
	gittest/settings.py