Make settings.SITE_ID optional
Merge branch 'fix_no_sites_framework' of https://github.com/bikeshedder/django-parler

Conflicts:
	parler/admin.py