Merge branch 'master' of https://github.com/ThemeKit/BootstrapAdmin

# Conflicts:
#	dist/css/theme.css

Author: georgemjohn

README.md

@@ -2,5 +2,5 @@
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
-[![Bootstrap Admin Template](http://themekit.lavalite.org/assets/images/banner.png)](http://themekit.lavalite.org/)
+[![Bootstrap Admin Template](http://themekit.lavalite.org/assets/images/banner.png#1)](http://themekit.lavalite.org/) 
 

index.html

@@ -108,11 +108,11 @@ <h4 class="header">Notifications</h4>
                             <div class="dropdown">
                                 <a class="dropdown-toggle" href="#" id="userDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><img class="avatar" src="img/user.jpg" alt=""></a>
                                 <div class="dropdown-menu dropdown-menu-right" aria-labelledby="userDropdown">
-                                    <a class="dropdown-item" href="profile.html"><i class="ik ik-user dropdown-icon"></i> Profile</a>
+                                    <a class="dropdown-item" href="pages/profile.html"><i class="ik ik-user dropdown-icon"></i> Profile</a>
                                     <a class="dropdown-item" href="#"><i class="ik ik-settings dropdown-icon"></i> Settings</a>
                                     <a class="dropdown-item" href="#"><span class="float-right"><span class="badge badge-primary">6</span></span><i class="ik ik-mail dropdown-icon"></i> Inbox</a>
                                     <a class="dropdown-item" href="#"><i class="ik ik-navigation dropdown-icon"></i> Message</a>
-                                    <a class="dropdown-item" href="login.html"><i class="ik ik-power dropdown-icon"></i> Logout</a>
+                                    <a class="dropdown-item" href="pages/login.html"><i class="ik ik-power dropdown-icon"></i> Logout</a>
                                 </div>
                             </div>
 

package.json

@@ -23,7 +23,7 @@
     "@claviska/jquery-minicolors": "^2.3.2",
     "amcharts3": "^3.21.14",
     "ammap3": "^3.21.14",
-    "bootstrap": "^4.1.3",
+    "bootstrap": "^4.2.1",
     "bootstrap-slider": "^10.3.2",
     "bootstrap-tagsinput": "^0.7.1",
     "c3": "^0.6.8",