Merge pull request #18 from clsmit8703/html_fb

Html fb pull for wc351:development
Merge pull request #19 from wc351/development

Merging to the Master branch
Merge pull request #8 from wc351/master

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

Development
Revert "Development"
Merge pull request #3 from crlyli/revert-2-development

Revert "Development"
Creating load files.

Created a load file for campuses, buildings and parking lots. Code does not currently work. Still need to work on images to satisfy not null constraint. Models to allow null in fields where data is not available
 in the shapefiles.
Merge pull request #20 from crlyli/development

Development
Revert "Development"
Merge pull request #21 from wc351/revert-20-development

Removing the last pull request.
Altered models added python load files

Added image models for all models that previously contained a foreign key to the pics model. Image field could not be null and caused problems when loading data. Created load files for campuses, buildings, parking lots, and faculty. Currently working on Faculty will not load.
Updated initial_data.json to removed spaces, etc.
Add migrations __init__
Merge branch 'development' of https://github.com/wc351/ungmap into load_fb2

Conflicts:
	apps/map/load/building_load.py
	apps/map/load/campus_load.py
	apps/map/load/parkinglot_load.py
	apps/map/migrations/__init__.py
	apps/map/models.py
Created views, urls and templates and updated load

Created list and detail views for buildings and faculty. Updated campus detail view to include links for buildings and faculty and created the url template tag instead of hard coding the url. Created templates for list and detail views. Updated faculty load file.
Merge pull request #25 from crlyli/development

Altered models added python load files
Merge pull request #9 from wc351/development

Catching up on code
Created URLs and implemented registration.

Implemented django-registration-redux to the project.

URL Structure

url(r'^accounts/' include('registration.backends.simple.urls'))

 url(r'^faculty/$', - This page will load the view for the faculty.
 url(r'^parkinglots/$', - This page will load view the parking lots.
 url(r'^recreation$', - This page will load the view for the recreation sites.
Delete settings.py
Merge pull request #10 from wc351/development

Development 4.0