Update to CB-1.5.2-R0.2-SNAPSHOT AND Merge Changes Made By Jadedwolf

This is a comprehensive Pull Request that merges all changes made by Jadedwolf and updates SRM to CB-1.5.2-R0.2-SNAPSHOT.

A development build can be found on my jenkins here:
http://ci.mineconomy.org/job/SRM-1.5.2/