Revert "Revert "Update for 1.5.2 prerelease""

This reverts commit 4d5da18fa115f9c1f673a8633580e35599c7a659.

Conflicts:
	bukkit-sample-plugin.iml
Update for 1.5.2