Merge branch 'dns_enabler' into dev
Merge branch 'generate_dynamic' into dev

Conflicts:
	cyder/cydns/nameserver/tests/test_models.py