RE-Added register events
Merge remote-tracking branch 'origin/master'

Conflicts:
	Launcher/src/me/bacon/launcher/Main.java
RE-Added register events