Band gepimpt
Merge remote-tracking branch 'origin/master' into live

Conflicts:
	band.php