Added Boost.Compute
Resolve conflicts