Merge pull request #8 from wc351/master

First Master pull...10/28
Merge pull request #9 from wc351/development

Catching up on code
Merge pull request #10 from wc351/development

Development 4.0
Merge pull request #12 from wc351/development

Updating code-- fixed search and views
Merge pull request #13 from wc351/development

Updating Code
Created the map html file to be added within pages.

Created the map url so that it can be loaded to individual pages.
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	apps/map/load/Faculty_load.py
	apps/map/load/building_load.py
	apps/map/load/campus_load.py
	apps/map/load/parkinglot_load.py
Added the map to the campusdetail.html.

The map is dynamic so that it will take the pk information from the selected campus detail and zoom to that part of the map.
Updated models, load file and api

Added three new models for parking spot types, parking lot lines and call boxes. Created the load file to loade the shapefiles for the new models. Also updated the api views, api urls and serializers to include the three additional models. Updated admin to include the new models. Still working on the call box load. Currently trying to figure out how to load the points from the shapefile.
Merge pull request #1 from wc351/development

Merge project to mine
Merge pull request #14 from wc351/development

Development
Merge pull request #33 from crlyli/development

Creating a pull request for additional load files
Merge pull request #15 from wc351/development

Development
Added GeoLocation to Campus Maps

I went tot he campus_detail.html page and added in the code to work with the Geolocation function.  I used https://www.mapbox.com/mapbox.js/example/v1.0.0/geolocation/ as a guide with working with the GeoLocation.  When a user clicks the "Find Me" button on the top of the campus detail page, it will pop up a point of where they are at (this works really well with Mobile Devices with the GPS turned on).

I am also pushing up the loads with my file paths instead of Will's.  I also just added some Lorem Ipsom text in the About Us page.
Merge pull request #34 from clsmit8703/development2

GeoLocation, AboutUS typo, NavBarStyle and Correction
Merge pull request #35 from wc351/development

Development