Rename event classes
Gitignore update
Merge branch 'master' of http://github.com/GraniteTeam/Granite

Conflicts:
	.gitignore
	Granite/src/main/java/org/granitemc/granite/reflect/SCMComposite.java