Beta 1.2.0.4
Merge remote-tracking branch 'origin/master'

Conflicts:
	Beta/ReactToBlack.java
Beta 1.2.1