Fix typos in user role mapping; add a "National Manager" user type that corresponds to national_admin.
Update user-type to role mappings; include user-type in column view.
Merge branch 'develop' of https://github.com/medic/kujua-lite into develop