連捐款設定
Merge remote-tracking branch 'origin/master'

Conflicts:
	donation/models.py