Merge branch 'development'

#Conflicts:
#	.DS_Store

firmwaretool.php

@@ -36,7 +36,7 @@ if (isset($_GET['equipmentID'])){$returnpage = 'equipment&equipmentID='.$_GET['e
 if (isAllowed('dashboard',$_SESSION['profile'],$_SESSION['permission'],'R') != 0){
   $view .= '
       <div class="content-header responsive-flex-column pad-top-5">
-          <a href="index.php?page='.$returnpage.'" class="btn">'.$button_cancel.'</a>
+          <a href="index.php?page='.$returnpage.'" class="btn">←</a>
       </div>
   ';
 }