no message
Merge branch 'master' of https://github.com/myongmyong/ki_myong

Conflicts:
	Donate/apps/controllers.py