Commit 8c2ed2e639a3088e661ce5226bc17fbe277821bc

Feature completions
        - Adding an option to specify shapefiles in geoJSON format
        - login.html uses the new bootstrap file now

       else if(type === "map"){
         var template = _.template($('#map-template').html());
           $('#specific-content').html(template({
             tileLayer: this.model.get('tileLayer')
+            tileLayer: this.model.get('tileLayer'),
+            shp: this.model.get('shp')
           }));
       }
     },

   // Map model
   var Map = BaseType.extend({
     defaults: _.extend(BaseType.prototype.defaults, {
       tileLayer: ""
+      tileLayer:"",
+      shp: ""
     }),
     initialize: function(){
       BaseType.prototype.initialize.call(this, arguments);

       var restrictBounds = new L.LatLngBounds(southWest, northEast);
       M.map = new L.Map('map',{mapBounds: restrictBounds, zoom: 2, worldCopyJump: true, center:[14.604847155053898, 2.8125] });
       L.tileLayer(this.model.get("tileLayer")).addTo(M.map);
+      if(this.model.has("shp")){
+        $.getJSON(this.model.get("shp"), function(data){
+          L.geoJSON(data);
+        });
+      }
     }
   });

           m-data-target="tileLayer">
         </div>
       </div>
+      <div class="form-group">
+        <div class="input-group">
+          <span class="input-group-addon"><strong>Shapefile</strong></span>
+          <input class="form-control"  type="text" placeholder="" value="<%= shp %>"
+          m-data-target="shp">
+        </div>
+      </div>
       <div class="preview"></div>
     </div>
   </script>

     <!-- Place favicon.ico in the root directory -->
     <link rel="stylesheet" href="{{url_for('static', filename='css/normalize.css')}}">
     <link rel="stylesheet" href="{{url_for('static', filename='css/bootstrap.css')}}">
+    <link rel="stylesheet" href="{{url_for('static', filename='css/bootstrap.min.css')}}">
     <style type="text/css">
       .form-wrapper {
         height: 300px;