2 users test
Merge remote-tracking branch 'origin/master' into origin/master

Conflicts:
	MC_1/src/com/github/marvinside/BaseMod.java