Merge remote-tracking branch 'origin/master'

Conflicts:
	kosaki/bankandsafe/BankAndSafe.java
	kosaki/bankandsafe/WorldEventHandler.java
	kosaki/bankandsafe/blocks/BlockBank.java
	kosaki/bankandsafe/blocks/BlockSafe.java
	kosaki/bankandsafe/items/Item1000MP.java
	kosaki/bankandsafe/items/Item100MP.java
	kosaki/bankandsafe/items/ItemMPWand.java
	kosaki/bankandsafe/plugins/SSPlugin.java

Merging with Pull Request

Changed BankAndSafe.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	kosaki/bankandsafe/BankAndSafe.java