Auto Promotion Fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/config/GlobalVars.java
	src/util/CustomTextPane.java