diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 6a29cba1..08f26414 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -128,22 +128,6 @@
         "message": "<span style=\"color: red\">Failed</span> to close serial port"
     },
 
-    "usbDeviceOpened": {
-        "message": "USB device <span style=\"color: green\">successfully</span> opened with ID: $1"
-    },
-    "usbDeviceOpenFail": {
-        "message": "<span style=\"color: red\">Failed</span> to open USB device!"
-    },
-    "usbDeviceClosed": {
-        "message": "USB device <span style=\"color: green\">successfully</span> closed"
-    },
-    "usbDeviceCloseFail": {
-        "message": "<span style=\"color: red\">Failed</span> to close USB device"
-    },
-    "usbDeviceUdevNotice": {
-        "message": "Are <strong>udev rules</strong> installed correctly? See docs for instructions"
-    },
-
     "noConfigurationReceived": {
         "message": "No configuration received within <span style=\"color: red\">10 seconds</span>, communication <span style=\"color: red\">failed</span>"
     },
@@ -206,18 +190,26 @@
         "message": "Cycle Time:"
     },
 
-    "dfu_connect_message": {
-        "message": "Please use the Firmware Flasher to access DFU devices"
+    "please_grant_usb_permissions": {
+        "message": "Please click on <strong>\"Request Optional Permissions\"</strong> button to grant application <strong style=\"color: red\">required</strong> <strong>USB</strong> access"
     },
-
-    "dfu_erased_kilobytes": {
-        "message": "Erased $1 kB of flash <span style=\"color: green\">successfully</span>"
+    "usb_permissions_granted": {
+        "message": "Optional <strong>USB</strong> permissions <strong style=\"color: #57a929\">granted</strong>"
     },
 
     "eeprom_saved_ok": {
         "message": "EEPROM <span style=\"color: #57a929\">saved</span>"
     },
 
+    "default_optional_permissions_head": {
+        "message": "Optional USB Permissions"
+    },
+    "default_optional_permissions_text": {
+        "message": "Due to addition of <strong>Naze32PRO</strong> to the supported hardware family, Configurator <strong style=\"color: red\">requires</strong> USB access to allow firmware flashing via DFU"
+    },
+    "default_request_optional_permissions": {
+        "message": "Request Optional Permissions"
+    },
     "defaultWelcomeText": {
         "message": "Welcome to <strong>Cleanflight - Configurator</strong>, a utility designed to simplify updating, configuring and tuning of your flight controller.<br /><br />The application supports all hardware that can run cleanflight (<a href=\"http://seriouslypro.com/spracingf3\" target=\"_blank\">SPRacingF3</a>, <a href=\"http://www.immersionrc.com/fpv-products/vortex-racing-quad/\" target=\"_blank\">Vortex</a>, <a href=\"https://github.com/TauLabs/TauLabs/wiki/Sparky\" target=\"_blank\">Sparky</a>, <a href=\"http://www.readymaderc.com/store/index.php?main_page=product_info&cPath=76_156&products_id=4221\" target=\"_blank\">DoDo</a>, <a href=\"https://www.openpilot.org/product/coptercontrol/\" target=\"_blank\">CC3D/EVO</a>, <a href=\"http://www.multiwiicopter.com/products/paris-air-hero-32-naze\" target=\"_blank\">Air Hero 32</a>, <a href=\"http://www.readytoflyquads.com/flight-controllers/flip-series\" target=\"_blank\">Flip32/+/Deluxe</a>, <a href=\"http://multirotormania.com/129-dragonfly32\" target=\"_blank\">DragonFly32</a>, <a href=\"http://www.goodluckbuy.com/micro-quadcopter-flight-driver-controller-9dof-9-axis-altitude-sensor-stm32f103.html\" target=\"_blank\">CJMCU Microquad</a>, Chebuzz F3, <a href=\"http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/PF254044\" target=\"_blank\">STM32F3Discovery</a>, <a href=\"http://www.overskyrc.com/hermit-micro-fpv-brushless-quadcopter-145mm-98g-fully-assembled-p-621.html\" target=\"_blank\">Hermit</a>, <a href=\"http://rcexplorer.se/blog/2015/05/introducing-the-naze32-tricopter-frame/\" target=\"_blank\">Naze32 Tricopter Frame</a>, <a href=\"http://www.2dogrc.com/skyline-32-naze-32-bit-flight-controller-acro-version.html\" target=\"_blank\">Skyline32</a>, <a href=\"http://abusemark.com/store/index.php?main_page=index&cPath=1\" target=\"_blank\">Naze/32/Mini/Pro</a>/<a href=\"http://www.massiverc.com/PrestaShop/en/574-massive-acro-blackbox-flight-control-board.html\" target=\"_blank\">Blackbox</a> etc)<br /><br />The firmware source code can be downloaded from <a href=\"https://github.com/cleanflight/cleanflight\" title=\"www.github.com\" target=\"_blank\">here</a><br />The newest binary firmware image is available <a href=\"https://github.com/cleanflight/cleanflight/releases\" title=\"www.github.com\" target=\"_blank\">here</a>, development builds available <a href=\"http://cleanflight.memoryleaks.org/builds/\" target=\"_blank\">here</a><br /><br />Latest <strong>CP210x Drivers</strong> can be downloaded from <a href=\"http://www.silabs.com/products/mcu/pages/usbtouartbridgevcpdrivers.aspx\" title=\"http://www.silabs.com/\" target=\"_blank\">here</a><br />"
     },
@@ -1137,8 +1129,7 @@
         "message": "Warning"
     },
     "firmwareFlasherWarningText": {
-        "message": "Please do <span style=\"color: red\">not</span> try to flash <strong>non-cleanflight</strong> hardware with this firmware flasher.<br />Do <span style=\"color: red\">not</span> <strong>disconnect</strong> the board or <strong>turn off</strong> your computer while flashing.<br /><br /><span style=\"color: green\">Note: </span>STM32 bootloader is stored in ROM, it cannot be bricked.<br />Note: <strong>Auto-Connect</strong> is always disabled while you are inside firmware flasher.<br /><span style=\"color: red\">Note: </span>Make sure you have a backup; some upgrades/downgrades will wipe your configuration.<br /><span style=\"color: green\">Note:</span> If you have problems flashing try disconnecting all cables from your FC.<br /><br /><span style=\"color: green\">Note: </span>If you have lost comminication with your board then power off the board, jumper the bootloader pins, power on, enable 'No reboot sequence', enable 'Full chip erase', re-flash, then power off, remove bootloader jumper, power on and connect (For all firmware except OPBL firmware)."
->>>>>>> cleanflight/development
+        "message": "Please do <span style=\"color: red\">not</span> try to flash <strong>non-cleanflight</strong> hardware with this firmware flasher.<br />Do <span style=\"color: red\">not</span> <strong>disconnect</strong> the board or <strong>turn off</strong> your computer while flashing.<br /><br /><span style=\"color: #57a929\">Note: </span>STM32 bootloader is stored in ROM, it cannot be bricked.<br />Note: <strong>Auto-Connect</strong> is always disabled while you are inside firmware flasher.<br /><span style=\"color: red\">Note: </span>Make sure you have a backup; some upgrades/downgrades will wipe your configuration.<br /><span style=\"color: #57a929\">Note:</span> If you have problems flashing try disconnecting all cables from your FC.<br /><br /><span style=\"color: #57a929\">Note: </span>If you have lost comminication with your board then power off the board, jumper the bootloader pins, power on, enable 'No reboot sequence', enable 'Full chip erase', re-flash, then power off, remove bootloader jumper, power on and connect (For all firmware except OPBL firmware)."
     },
     "firmwareFlasherButtonLeave": {
         "message": "Leave Firmware Flasher"
diff --git a/main.html b/main.html
index 76c4161f..ee6ddbab 100755
--- a/main.html
+++ b/main.html
@@ -29,51 +29,53 @@
     <link type="text/css" rel="stylesheet" href="./styles/opensans_webfontkit/fonts.css" media="all" />
     <link type="text/css" rel="stylesheet" href="./styles/dropdown-lists/css/style_lists.css" media="all" />
     <link type="text/css" rel="stylesheet" href="./js/libraries/switchery/dist/switchery.css" media="all" />
-    <script type="text/javascript" src="./js/libraries/q.js"></script>
-    <script type="text/javascript" src="./js/libraries/google-analytics-bundle.js"></script>
-    <script type="text/javascript" src="./js/libraries/jquery-2.1.3.min.js"></script>
-    <script type="text/javascript" src="./js/libraries/jquery-ui-1.11.2.min.js"></script>
-    <script type="text/javascript" src="./js/libraries/d3.min.js"></script>
-    <script type="text/javascript" src="./js/libraries/jquery.nouislider.all.min.js"></script>
-    <script type="text/javascript" src="./js/libraries/three/three.min.js"></script>
-    <script type="text/javascript" src="./js/libraries/three/Projector.js"></script>
-    <script type="text/javascript" src="./js/libraries/three/CanvasRenderer.js"></script>
-    <script type="text/javascript" src="./js/libraries/jquery.flightindicators.js"></script>
-    <script type="text/javascript" src="./js/libraries/semver.js"></script>
-    <script type="text/javascript" src="./js/port_handler.js"></script>
-    <script type="text/javascript" src="./js/port_usage.js"></script>
-    <script type="text/javascript" src="./js/serial.js"></script>
-    <script type="text/javascript" src="./js/usb.js"></script>
-    <script type="text/javascript" src="./js/gui.js"></script>
-    <script type="text/javascript" src="./js/model.js"></script>
-    <script type="text/javascript" src="./js/request_balancer.js"></script>
-    <script type="text/javascript" src="./js/serial_backend.js"></script>
-    <script type="text/javascript" src="./js/data_storage.js"></script>
-    <script type="text/javascript" src="./js/msp.js"></script>
-    <script type="text/javascript" src="./js/backup_restore.js"></script>
-    <script type="text/javascript" src="./js/protocols/stm32.js"></script>
-    <script type="text/javascript" src="./js/protocols/stm32usbdfu.js"></script>
-    <script type="text/javascript" src="./js/localization.js"></script>
-    <script type="text/javascript" src="./js/boards.js"></script>
-    <script type="text/javascript" src="./main.js"></script>
-    <script type="text/javascript" src="./tabs/landing.js"></script>
-    <script type="text/javascript" src="./tabs/setup.js"></script>
-    <script type="text/javascript" src="./tabs/help.js"></script>
-    <script type="text/javascript" src="./tabs/ports.js"></script>
-    <script type="text/javascript" src="./tabs/configuration.js"></script>
-    <script type="text/javascript" src="./tabs/pid_tuning.js"></script>
-    <script type="text/javascript" src="./tabs/receiver.js"></script>
-    <script type="text/javascript" src="./tabs/auxiliary.js"></script>
-    <script type="text/javascript" src="./tabs/adjustments.js"></script>
-    <script type="text/javascript" src="./tabs/servos.js"></script>
-    <script type="text/javascript" src="./tabs/gps.js"></script>
-    <script type="text/javascript" src="./tabs/motors.js"></script>
-    <script type="text/javascript" src="./tabs/led_strip.js"></script>
-    <script type="text/javascript" src="./tabs/sensors.js"></script>
-    <script type="text/javascript" src="./tabs/cli.js"></script>
-    <script type="text/javascript" src="./tabs/logging.js"></script>
-    <script type="text/javascript" src="./tabs/dataflash.js"></script>
-    <script type="text/javascript" src="./tabs/firmware_flasher.js"></script>
+        <script type="text/javascript" src="./js/libraries/q.js"></script>
+        <script type="text/javascript" src="./js/libraries/google-analytics-bundle.js"></script>
+        <script type="text/javascript" src="./js/libraries/jquery-2.1.4.min.js"></script>
+        <script type="text/javascript" src="./js/libraries/jquery-ui-1.11.4.min.js"></script>
+        <script type="text/javascript" src="./js/libraries/d3.min.js"></script>
+        <script type="text/javascript" src="./js/libraries/jquery.nouislider.all.min.js"></script>
+        <script type="text/javascript" src="./js/libraries/three/three.min.js"></script>
+        <script type="text/javascript" src="./js/libraries/three/Projector.js"></script>
+        <script type="text/javascript" src="./js/libraries/three/CanvasRenderer.js"></script>
+        <script type="text/javascript" src="./js/libraries/jquery.flightindicators.js"></script>
+        <script type="text/javascript" src="./js/libraries/semver.js"></script>
+        <script type="text/javascript" src="./js/port_handler.js"></script>
+        <script type="text/javascript" src="./js/port_usage.js"></script>
+        <script type="text/javascript" src="./js/serial.js"></script>
+        <script type="text/javascript" src="./js/gui.js"></script>
+        <script type="text/javascript" src="./js/model.js"></script>
+        <script type="text/javascript" src="./js/request_balancer.js"></script>
+        <script type="text/javascript" src="./js/serial_backend.js"></script>
+        <script type="text/javascript" src="./js/data_storage.js"></script>
+        <script type="text/javascript" src="./js/msp.js"></script>
+        <script type="text/javascript" src="./js/backup_restore.js"></script>
+        <script type="text/javascript" src="./js/protocols/stm32.js"></script>
+        <script type="text/javascript" src="./js/protocols/stm32usbdfu.js"></script>
+        <script type="text/javascript" src="./js/localization.js"></script>
+        <script type="text/javascript" src="./js/boards.js"></script>
+        <script type="text/javascript" src="./main.js"></script>
+
+        <script type="text/javascript" src="./tabs/landing.js"></script>
+        <script type="text/javascript" src="./tabs/setup.js"></script>
+        <script type="text/javascript" src="./tabs/help.js"></script>
+        <script type="text/javascript" src="./tabs/ports.js"></script>
+        <script type="text/javascript" src="./tabs/configuration.js"></script>
+        <script type="text/javascript" src="./tabs/pid_tuning.js"></script>
+        <script type="text/javascript" src="./tabs/receiver.js"></script>
+<!--         <script type="text/javascript" src="./tabs/modes.js"></script> -->
+        <script type="text/javascript" src="./tabs/auxiliary.js"></script>
+        <script type="text/javascript" src="./tabs/adjustments.js"></script>
+        <script type="text/javascript" src="./tabs/servos.js"></script>
+        <script type="text/javascript" src="./tabs/gps.js"></script>
+        <script type="text/javascript" src="./tabs/motors.js"></script>
+        <script type="text/javascript" src="./tabs/led_strip.js"></script>
+        <script type="text/javascript" src="./tabs/sensors.js"></script>
+        <script type="text/javascript" src="./tabs/cli.js"></script>
+        <script type="text/javascript" src="./tabs/logging.js"></script>
+        <script type="text/javascript" src="./tabs/dataflash.js"></script>
+        <script type="text/javascript" src="./tabs/firmware_flasher.js"></script>
+    
     <script type="text/javascript" src="./js/libraries/switchery/dist/switchery.js"></script>
     <title></title>
   </head>