Help git normalize line endings.
Basic Persona integration: only conf['default_admin'] may admin
Normalize some line endings
Merge branch 'persona-phase-1'

Conflicts:
	inc/strings.inc
	pages/admin.inc