tests fixup for django update to 1.4
proper secret key import
Merge remote-tracking branch 'origin/retainer_billing'

Conflicts:
	adlibre_tms/settings.py