Control of Modular Aerial Robots: Combining Under- and Fully-Actuated Behaviors