overnight updates
Merge branch 'master' of github.com:kusamau/beamteam

Conflicts:
	beamteam/beamteam/core/processor.py
Merge branch 'master' of github.com:kusamau/beamteam

Conflicts:
	beamteam/beamteam/core/processor.py