Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	src/com/projectkorra/ProjectKorra/RevertChecker.java
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 7801239208e42c46be18965f6c42433489168139.