merge fail
Merge origin/master

Conflicts:
	ColorPortal/src/main/java/me/killje/colorportal/Channel.java
	ColorPortal/src/main/java/me/killje/colorportal/ColorPortal2.java
	ColorPortal/src/main/java/me/killje/colorportal/Listener2.java
	ColorPortal/src/main/java/me/killje/colorportal/Portal2.java