Added Links to UGD docs in Api docs

-Added links to UGD docs
-RenamedTemplates to UGDs
-Rebased on the latest develop from upstream.