Merging 2.3 -> FX
Shirley/Ying approached me today asking to merge the us_fx branch into the rel_2.3 branch. As rel_2.3 has not be stablized yet (2.3.0.1 has not be officially built) I was hesitant and suggested instead ot merge the reL_2.3 branch into the us_fx. This caused a massive amount of merging (561 elements) probably due to the fact that lots of stuff changed in reL_2.3 that the FX engineers did not care about (other areas of the platform code as well as the web pages, SAM, etc). There were a few elements that require manual merging. Shirley is aware of these.