Renaming FJConvex pt1.
Renaming FJConvex pt2.
Renamed FJComplex pt3.
Merge branch 'master' into parallelize