Removed Java7 diamond syntax usage usage (sources must be compatible with Java6)
Updated BP libs