Merge pull request #5 from DonoA/master

merging and framework
Merge pull request #1 from MCME/master

update fork
Merge pull request #2 from DonoA/master

Fixed protection and bound calculations
added painting/item frame protection
Merge pull request #6 from aaldim1/master

updated protection
Files now save and themes can survive restarts
Merge branch 'master' of https://github.com/DonoA/PlotManager

Conflicts:
	src/main/java/com/mcmiddleearth/freebuild/Protection.java