Mark payments as received.
Merge branch 'master' of github.com:basa/charge

Conflicts:
	src/charge/templates/charge/event_detail.html