Added color armor support
Merge remote-tracking branch 'github/dev' into dev

Conflicts:
	src/main/java/ch/njol/skript/log/SkriptLogger.java
	src/main/java/ch/njol/skript/util/Color.java