Save/load beacon effects
Merge branch 'master' of https://github.com/Pheenixm/BetterBeacons

Conflicts:
	BetterBeacons/src/com/pheenixm/betterbeacons/BetterBeacons.java
	BetterBeacons/src/com/pheenixm/betterbeacons/data/PluginConfigBeaconStorage.java
Merge branch 'master' of https://github.com/Pheenixm/BetterBeacons

Conflicts:
	BetterBeacons/src/com/pheenixm/betterbeacons/BetterBeacons.java
	BetterBeacons/src/com/pheenixm/betterbeacons/BetterBeaconsManager.java
	BetterBeacons/src/com/pheenixm/betterbeacons/BetterBeaconsProperties.java
Merge pull request #4 from erocs/master

Save/load beacon effects