Merge remote-tracking branch 'origin/master'

BeHub/Hub/templates/user_panel/content/beacon_detail.html

@@ -16,4 +16,4 @@
       </tr>
     </tbody>
   </table>
-        </div>
+</div>

BeHub/Hub/templates/user_panel/content/beacons.html

+<script>
+    $(document).ready(function(){
+        show_beacons();
+    });
+</script>
 <div class="container">
+        <div id="container__">
 
+        </div>
 
         {% for beacon_data in beacon_display  %}
         {% include 'user_panel/content/beacon_detail.html' %}

BeHub/Hub/templates/user_panel/default/base.html

@@ -32,6 +32,7 @@
         {% include 'user_panel/default/footer.html' %}
 
     <script src="{% static 'js/map.js' %}"></script>
+    <script src="{% static 'js/beacon.js' %}"></script>
     <script src="{% static 'js/project_detail.js' %}"></script>
     <script src="{% static 'js/bootstrap.js' %}"></script>
     </body>