made that shit wurkkk!11
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Scanner/PromotorScanner.py