upgraded django to 1.6 and moved to leafletjs
Merge remote-tracking branch 'origin/master'

Conflicts:
	mnlp/lionmap/static/css/jquery-ui.css
	mnlp/lionmap/static/js/leaflet/images/layers.png
	mnlp/lionmap/static/js/leaflet/leaflet.css
	mnlp/lionmap/static/js/leaflet/leaflet.js
	mnlp/lionmap/static/js/main.js
	mnlp/lionmap/static/kml/OlKinyeied.json
	mnlp/lionmap/views.py
	mnlp/mnlp/templates/map.html
	mnlp/mnlp/urls.py
modified crontab file