upgrade Django 1.6.2 part 5
Merge remote-tracking branch 'origin/django-1.6.2' into django-1.6.2

Conflicts:
	boris/static/css/custom.css
	boris/static/css/popup.css
upgrade Django 1.6.2 part 6