Merge pull request #29 from crlyli/development

Updated models, urls, views, and templates
Merge pull request #30 from crlyli/development

Development
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.
Merge pull request #1 from wc351/development

Merge project to mine