STATICFILES_DIRS added
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	litheblas/settings/local.py_