Adding CustomerTacker + Cross Launch on 360
Fixing merge issues