Working on a better patch for aura
Merge remote-tracking branch 'origin/master'

Conflicts:
	com/nanoguard/plugin/protect/player/PlayerStatus.java
Merge remote-tracking branch 'origin/master'