modify columns
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/base/models.py
Merge remote-tracking branch 'origin/master'