Fixed Branches to have all data

Had wrong assumption about branches. Branches need to have all updated data from MASTER merged down to branches & fix merge issues with reworked components, then merge back up to MASTER.