rebased

Conflicts:
	concert/helpers.py