Billing (w/o currency conversion yet)
Merge branch 'master' of github.com:basa/charge

Conflicts:
	src/charge/models.py
	src/charge/templates/charge/event_detail.html
	src/charge/urls.py
	src/charge/utils.py