Fixed Merge Conflicts and Almost done with Checkins

All I have left to do with checkins is to add the search clientside checkins to the checkins section of the portal.