Merges from parent enketo-express project and branding changes.

Merges from parent enketo-express project and branding changes.