Color changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/liquidbot/bot/client/RSLoader.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/liquidbot/bot/client/RSLoader.java