Attempted to correct issue with chests in a deleted world, breaking things
update to Bukkit 1.5.2-R1.1
Update to 1.6.2  Fix NPE
Update version
Merge pull request #83 from squidicuzz/master

Bug Fixes, Compiled against bukkit 1.6.2
Sorta Support for Factions 2.x
Exclude transitive WG deps (i.e. Bukkit 0.0.1 and Spout)
Merge remote-tracking branch 'upstream/Factions_2.x'
Merge branch 'master' of github.com:MinecraftWars/Gringotts

Conflicts:
	pom.xml
remove empty code or something?
update maven-shade-plugin for mvn 3.1 compatibility
Merge pull request #85 from bezeek/master

Exclude transitive WG deps (i.e. Bukkit 0.0.1 and Spout)
intellij specific stuff
prepare next dev cycle: upate to snapshot version, java version 1.7, factions 2.0