Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,34 @@
+<!--
+    Before opening a new issue, please search through the existing issues to
+    see if your topic has already been addressed. Note that you may need to
+    remove the "is:open" filter from the search bar to include closed issues.
+
+    Check the appropriate type for your issue below by placing an x between the
+    brackets. 
+
+    Please note that issues which do not fall under any of the below categories
+    will be closed.
+--->
+### Issue type:
+- [ ] Feature request <!-- Requesting the implementation of a new feature -->
+- [ ] Bug report      <!-- Reporting unexpected or erroneous behavior --> 
+- [ ] Documentation   <!-- Proposing a modification to the documentation -->
+
+<!--
+    Please describe the environment.
+-->
+### Environment:
+* AdminLTE Version:  <!-- Example: 2.4 -->
+* Operating System:  <!-- Example: OSX/Android -->
+* Browser (Version):  <!-- Example: Chrome (Latest) -->
+
+<!--
+    BUG REPORTS must include:
+        * Steps or URL needed to reproduce the bug/issue
+        * Any relevant error messages (screenshots may also help)
+        * A snippet of your markup (where applicable)
+
+    FEATURE REQUESTS must include:
+        * A detailed description of the proposed functionality
+-->
+### Description:

bower.json

@@ -8,7 +8,7 @@
   "main": [
     "index2.html",
     "dist/css/AdminLTE.css",
-    "dist/js/app.js",
+    "dist/js/adminlte.js",
     "build/less/AdminLTE.less"
   ],
   "keywords": [

index2.html

@@ -1562,7 +1562,7 @@
 <!-- SlimScroll -->
 <script src="bower_components/jquery-slimscroll/jquery.slimscroll.min.js"></script>
 <!-- ChartJS -->
-<script src="bower_components/Chart.js/Chart.js"></script>
+<script src="bower_components/chart.js/Chart.js"></script>
 <!-- AdminLTE dashboard demo (This is only for demo purposes) -->
 <script src="dist/js/pages/dashboard2.js"></script>
 <!-- AdminLTE for demo purposes -->