Antenna tracker & master merge

Added antenna tracking functionality