Merge branch 'next' into durk-atc

Resolving merge conflicts indicated below.
Conflicts:
	src/ATC/CMakeLists.txt
	src/ATC/Makefile.am
	src/Main/fg_init.cxx

diff --cc src/ATC/CMakeLists.txt
index d7822c9873e63b0c23ba120806658c1798e7896b,98b6a0d250a9521e341dc04369a7463fce9132f7..dd1c0039662e29b7b585c850281adc54bb42d87d
--- 1/src/ATC/CMakeLists.txt
--- 2/src/ATC/CMakeLists.txt
+++ b/src/ATC/CMakeLists.txt
@@@ -1,9 -1,8 +1,9 @@@
  include(FlightGearComponent)
  
  set(SOURCES
-       atis_mgr.cxx
 +      atc_mgr.cxx
        trafficcontrol.cxx
+       CommStation.cxx
        )
        
  flightgear_component(ATC "${SOURCES}")

diff --cc src/ATC/Makefile.am
index fd5302aac30395eb14fff385c25efdd627be700d,046428e83c9368c0b868c95070db296fca066dfc..522a82033d1a5639c960d97790de2cff73db47c0
--- 1/src/ATC/Makefile.am
--- 2/src/ATC/Makefile.am
+++ b/src/ATC/Makefile.am
@@@ -1,9 -1,7 +1,9 @@@
  noinst_LIBRARIES = libATC.a
  
  libATC_a_SOURCES = \
-       atis_mgr.cxx atis_mgr.hxx \
 -    CommStation.cxx CommStation.hxx \
 +      atcdialog.cxx atcdialog.hxx \
 +      atc_mgr.cxx atc_mgr.hxx \
++      CommStation.cxx CommStation.hxx \
        trafficcontrol.cxx trafficcontrol.hxx 
  
  INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src

diff --cc src/ATCDCL/ATCDialog.cxx
Simple merge

diff --cc src/Main/fg_init.cxx
index bccabc3c98cf687c605defcdf3641fa7ce4a38a9,9fd101b65f7319b5296bf97dc727ff9615e0e34e..d573383181eabde0633ee20acb8c63608af61b6d
--- 1/src/Main/fg_init.cxx
--- 2/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@@ -75,9 -75,6 +75,7 @@@
  #include <AIModel/AIManager.hxx>
  
  #include <ATCDCL/ATCmgr.hxx>
- #include <ATCDCL/commlist.hxx>
- #include <ATC/atis_mgr.hxx>
 +#include <ATC/atc_mgr.hxx>
  
  #include <Autopilot/route_mgr.hxx>
  #include <Autopilot/autopilotgroup.hxx>
@@@ -1428,16 -1416,6 +1421,16 @@@ bool fgInitSubsystems() 
      globals->set_ATC_mgr(new FGATCMgr);
      globals->get_ATC_mgr()->init(); 
  
-     globals->add_subsystem("atis", new FGAtisManager, SGSubsystemMgr::POST_FDM);
 +    ////////////////////////////////////////////////////////////////////
 +   // Initialize the ATC subsystem
 +    ////////////////////////////////////////////////////////////////////
 +    globals->add_subsystem("ATC", new FGATCManager, SGSubsystemMgr::POST_FDM);
 +    ////////////////////////////////////////////////////////////////////
 +    // Initialise the ATIS Subsystem
 +    ////////////////////////////////////////////////////////////////////
++    //globals->add_subsystem("atis", new FGAtisManager, SGSubsystemMgr::POST_FDM);
 +
 +
      ////////////////////////////////////////////////////////////////////
      // Initialize multiplayer subsystem
      ////////////////////////////////////////////////////////////////////