Added capability to import layers from a geoevents source
Merge remote-tracking branch 'origin/master'

Conflicts:
	geoq/maps/templates/maps/layer_list.html
	geoq/maps/views.py