logic
Merge remote-tracking branch 'origin/master'

Conflicts:
	slot/js/views/components/SlotColumn.js
	slot/js/views/components/SlotMachine.js