Merged PredictionController.m
Fixed locking errors, but still having JSON data problems.
Mergin files some more