Fixed boundary condition problem in step_1. Moved calc_jphi outside of else statement in inner loop in gs_solver.
Fixed merge conflicts.