payments
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/conferences/static/conferences/css/style.css