add markerId to layer.kml
add media to test_settings
add unicode to south_settings
Merge branch 'fixes'

Conflicts:
	django_webmap_corpus/tests/south_settings.py