Conflicts: ArduPlane/ArduPlane.pde libraries/AP_Camera/AP_Camera.h libraries/AP_Mount/AP_Mount.cpp libraries/AP_Mount/AP_Mount.h
ArduCopterMega -> ArduCopter added archives directory for old code