Begin work on Aurora.
Merge remote-tracking branch 'origin/master'

Conflicts:
	BattleKits/src/com/lavacraftserver/BattleKits/CommandBattleKits.java
Aurora
Remove crap